- add stage support

- allow build / strip without root privilege

5 files changed, 55 insertions, 11 deletions

diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 0c4f82be1fe7..d3da8e60d2cc 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -9,17 +9,16 @@ MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/jmpc/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library to parse CGI Forms
 
-LIB_DEPENDS=	mime.1:${PORTSDIR}/devel/mime
+LIB_DEPENDS=	libmime.so:${PORTSDIR}/devel/mime
 
 GNU_CONFIGURE=	yes
-MAN3=		cgiclose.3 cgigetvalue.3 cginewquerystr.3
 USE_LDCONFIG=	yes
 CFLAGS+=	"-fPIC"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-install:
-	${LN} -sf libcgiparse.so.1 ${PREFIX}/lib/libcgiparse.so
+	${LN} -sf libcgiparse.so.1 ${STAGEDIR}${PREFIX}/lib/libcgiparse.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgiparse.so
 
 .include <bsd.port.post.mk>
diff --git a/www/cgiparse/files/patch-Makefile.in b/www/cgiparse/files/patch-Makefile.in
new file mode 100644
index 000000000000..27c39472cd1c
--- /dev/null
+++ b/www/cgiparse/files/patch-Makefile.in
@@ -0,0 +1,44 @@
+--- ./Makefile.in.orig	2014-05-24 19:06:10.000000000 +0200
++++ ./Makefile.in	2014-05-24 19:08:17.000000000 +0200
+@@ -38,7 +38,7 @@
+ LIBDIR = @libdir@
+ LIBOWN = 0
+ LIBGRP = 0
+-LIBMOD = 0444
++LIBMOD = 0644
+ INCDIR = @includedir@
+ INCOWN = 0
+ INCGRP = 0
+@@ -72,24 +72,21 @@
+ 	    $(TPROG) $(TOBJS) .depend
+ 
+ install: $(ARNAME) $(SONAME) $(PANAME) maninstall
+-	mkdir -p -m 755 $(LIBDIR)
++	mkdir -p -m 755 $(DESTDIR)$(LIBDIR)
+ 	for i in $(ARNAME) $(SONAME) $(PANAME); do		\
+-		cp $$i $(LIBDIR);				\
+-		chown $(LIBOWN):$(LIBGRP) $(LIBDIR)/$$i;	\
+-		chmod $(LIBMOD) $(LIBDIR)/$$i;			\
++		cp $$i $(DESTDIR)$(LIBDIR);				\
++		chmod $(LIBMOD) $(DESTDIR)$(LIBDIR)/$$i;			\
+ 	done
+-	mkdir -p -m 755 $(INCDIR)
++	mkdir -p -m 755 $(DESTDIR)$(INCDIR)
+ 	for i in $(INCS); do					\
+-		cp $$i $(INCDIR);				\
+-		chown $(INCOWN):$(INCGRP) $(INCDIR)/$$i;	\
+-		chmod $(INCMOD) $(INCDIR)/$$i;			\
++		cp $$i $(DESTDIR)$(INCDIR);				\
++		chmod $(INCMOD) $(DESTDIR)$(INCDIR)/$$i;			\
+ 	done
+ 
+ maninstall: $(MAN3)
+-	cp $(MAN3) $(MANDIR)/man3
++	cp $(MAN3) $(DESTDIR)$(MANDIR)/man3
+ 	for i in $(MAN3); do					\
+-		chown $(MANOWN):$(MANGRP) $(MANDIR)/man3/$$i;	\
+-		chmod $(MANMOD) $(MANDIR)/man3/$$i;		\
++		chmod $(MANMOD) $(DESTDIR)$(MANDIR)/man3/$$i;		\
+ 	done
+ 
+ depend:
diff --git a/www/cgiparse/pkg-plist b/www/cgiparse/pkg-plist
index c409902f7b25..8f6a91699914 100644
--- a/www/cgiparse/pkg-plist
+++ b/www/cgiparse/pkg-plist
@@ -3,3 +3,6 @@ lib/libcgiparse.a
 lib/libcgiparse.so
 lib/libcgiparse.so.1
 lib/libcgiparse_p.a
+man/man3/cgiclose.3.gz
+man/man3/cgigetvalue.3.gz
+man/man3/cginewquerystr.3.gz
diff --git a/www/man2web/Makefile b/www/man2web/Makefile
index ed23b782ab1f..b7a8620bd0d1 100644
--- a/www/man2web/Makefile
+++ b/www/man2web/Makefile
@@ -15,18 +15,14 @@ CONFIGURE_ARGS=	--bindir="${PREFIX}/${CGIDIR}" \
 		--with-manpath=/usr/share/man:${LOCALBASE}/man \
 		--with-distro=freebsd --enable-lynx
 
+CGIDIR=		www/cgi-bin
 PLIST_SUB=	CGIDIR="${CGIDIR}"
-CGIDIR=	www/cgi-bin
 
-MAN1=	man2web.1
-MAN5=	man2web.conf.5
-
-NO_STAGE=	yes
 post-extract:
 	${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/src/section_h/
 
 # default Apache configuration disallows symlinks in cgi-bin
 post-install:
-	${LN} -sf ${PREFIX}/${CGIDIR}/man2web ${PREFIX}/bin/man2web
+	${LN} -sf ${PREFIX}/${CGIDIR}/man2web ${STAGEDIR}${PREFIX}/bin/man2web
 
 .include <bsd.port.mk>
diff --git a/www/man2web/pkg-plist b/www/man2web/pkg-plist
index 2e2e2d09d35e..3f6dea8e7b66 100644
--- a/www/man2web/pkg-plist
+++ b/www/man2web/pkg-plist
@@ -1,4 +1,6 @@
 bin/man2web
-%%CGIDIR%%/man2web
 etc/man2web.conf.default
+man/man1/man2web.1.gz
+man/man5/man2web.conf.5.gz
+%%CGIDIR%%/man2web
 @dirrmtry %%CGIDIR%%