Support staging.

Approved by:	portmgr@

6 files changed, 163 insertions, 27 deletions

diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile
index 3fc8ce865bf4..9c89e34236fe 100644
--- a/dns/firedns/Makefile
+++ b/dns/firedns/Makefile
@@ -13,31 +13,12 @@ COMMENT=	A C library for handling asynchronous DNS queries
 
 BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN1=		fdnscname.1 fdnsip.1 fdnsip6.1 fdnsip6list.1 fdnsiplist.1 fdnsmx.1 \
-		fdnsmxalist.1 fdnsmxlist.1 fdnsname.1 fdnsnamep.1 fdnsspf1.1 \
-		fdnstxt.1 fdnstxtlist.1
-
-MAN3=		firedns_aton4.3 firedns_aton6.3 firedns_dnsbl_lookup.3 \
-		firedns_free_mxalist.3 firedns_getcname.3 firedns_getip4.3 \
-		firedns_getip4list.3 firedns_getip6.3 firedns_getip6list.3 \
-		firedns_getmx.3 firedns_getmxlist.3 firedns_getname4.3 \
-		firedns_getname6.3 firedns_getresult.3 firedns_gettxt.3 \
-		firedns_gettxtlist.3 firedns_ntoa4.3 firedns_ntoa6.3 \
-		firedns_resolvecname.3 firedns_resolveip4.3 \
-		firedns_resolveip4list.3 firedns_resolveip6.3 \
-		firedns_resolveip6list.3 firedns_resolvemx.3 \
-		firedns_resolvemxalist.3 firedns_resolvemxlist.3 \
-		firedns_resolvename4.3 firedns_resolvename6.3 \
-		firedns_resolvetxt.3 firedns_resolvetxtlist.3 \
-		libfiredns.3
-
-NO_STAGE=	yes
 pre-configure:
 	@-${RM} ${WRKSRC}/firemake/*.orig
 
diff --git a/dns/firedns/files/patch-firemake__binaries b/dns/firedns/files/patch-firemake__binaries
new file mode 100644
index 000000000000..b162dbb9099e
--- /dev/null
+++ b/dns/firedns/files/patch-firemake__binaries
@@ -0,0 +1,38 @@
+--- firemake/binaries.orig	2014-05-20 14:42:24.803606033 +0800
++++ firemake/binaries	2014-05-20 14:43:27.873622908 +0800
+@@ -55,9 +55,9 @@ case $PHASE in
+ 				disp "	skipping $BINARY"
+ 			else
+ 				dispn "	$BINARY..."
+-				$ECHO "	$INSTALL $BINARY \$(BINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++				$ECHO "	$INSTALL $BINARY \$(DESTDIR)\$(BINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
+ 				if test "$STRIP" != ""; then
+-					$ECHO "	$STRIP \$(BINDIR)/$BINARY"
++					$ECHO "	$STRIP \$(DESTDIR)\$(BINDIR)/$BINARY"
+ 				fi
+ 				disp "done"
+ 			fi
+@@ -68,9 +68,9 @@ case $PHASE in
+ 				disp "	skipping $BINARY"
+ 			else
+ 				dispn "	$BINARY..."
+-				$ECHO "	$INSTALL $BINARY \$(SBINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++				$ECHO "	$INSTALL $BINARY \$(DESTDIR)\$(SBINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
+ 				if test "$STRIP" != ""; then
+-					$ECHO "	$STRIP \$(SBINDIR)/$BINARY"
++					$ECHO "	$STRIP \$(DESTDIR)\$(SBINDIR)/$BINARY"
+ 				fi
+ 				disp "done"
+ 			fi
+@@ -81,9 +81,9 @@ case $PHASE in
+ 				disp "	skipping $BINARY"
+ 			else
+ 				dispn "	$BINARY..."
+-				$ECHO "	$INSTALL $BINARY \$(BINDIR) $INSTALL_USER $INSTALL_GROUP 4755"
++				$ECHO "	$INSTALL $BINARY \$(DESTDIR)\$(BINDIR) $INSTALL_USER $INSTALL_GROUP 4755"
+ 				if test "$STRIP" != ""; then
+-					$ECHO "	$STRIP \$(BINDIR)/$BINARY"
++					$ECHO "	$STRIP \$(DESTDIR)\$(BINDIR)/$BINARY"
+ 				fi
+ 				disp "done"
+ 			fi
diff --git a/dns/firedns/files/patch-firemake__headers b/dns/firedns/files/patch-firemake__headers
new file mode 100644
index 000000000000..8ff3fd26289b
--- /dev/null
+++ b/dns/firedns/files/patch-firemake__headers
@@ -0,0 +1,11 @@
+--- firemake/headers.orig	2014-05-20 14:43:33.135642364 +0800
++++ firemake/headers	2014-05-20 14:43:44.118599465 +0800
+@@ -16,7 +16,7 @@ case $PHASE in
+ 		$ECHO "install_headers:"
+ 
+ 		for HEADER in $HEADERS; do
+-			$ECHO "	$INSTALL $HEADER \$(INCLUDEDIR) $INSTALL_USER $INSTALL_GROUP 0644"
++			$ECHO "	$INSTALL $HEADER \$(DESTDIR)\$(INCLUDEDIR) $INSTALL_USER $INSTALL_GROUP 0644"
+ 		done
+ 		$ECHO
+ 
diff --git a/dns/firedns/files/patch-firemake__man b/dns/firedns/files/patch-firemake__man
new file mode 100644
index 000000000000..b30a02896ab9
--- /dev/null
+++ b/dns/firedns/files/patch-firemake__man
@@ -0,0 +1,56 @@
+--- firemake/man.orig	2014-05-20 14:45:41.801589832 +0800
++++ firemake/man	2014-05-20 14:46:24.364609956 +0800
+@@ -38,7 +38,7 @@ case $PHASE in
+ 		if test "$MAN1" != ""; then
+ 			dispn "	Section 1..."
+ 			for MAN in $MAN1; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man1 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man1 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -46,7 +46,7 @@ case $PHASE in
+ 		if test "$MAN3" != ""; then
+ 			dispn "	Section 3..."
+ 			for MAN in $MAN3; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man3 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man3 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -54,7 +54,7 @@ case $PHASE in
+ 		if test "$MAN5" != ""; then
+ 			dispn "	Section 5..."
+ 			for MAN in $MAN5; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man5 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man5 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -62,7 +62,7 @@ case $PHASE in
+ 		if test "$MAN6" != ""; then
+ 			dispn "	Section 6..."
+ 			for MAN in $MAN6; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man6 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man6 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -70,7 +70,7 @@ case $PHASE in
+ 		if test "$MAN7" != ""; then
+ 			dispn "	Section 7..."
+ 			for MAN in $MAN7; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man7 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man7 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -78,7 +78,7 @@ case $PHASE in
+ 		if test "$MAN8" != ""; then
+ 			dispn "	Section 8..."
+ 			for MAN in $MAN8; do
+-				$ECHO "	$INSTALL $MAN \$(MANDIR)/man8 $INSTALL_USER $INSTALL_GROUP 0644"
++				$ECHO "	$INSTALL $MAN \$(DESTDIR)\$(MANDIR)/man8 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
diff --git a/dns/firedns/files/patch-firemake_libraries b/dns/firedns/files/patch-firemake_libraries
index 8ffab13db2d6..095dc938fef8 100644
--- a/dns/firedns/files/patch-firemake_libraries
+++ b/dns/firedns/files/patch-firemake_libraries
@@ -1,11 +1,17 @@
---- firemake/libraries.orig	Tue Jan 27 02:20:13 2004
-+++ firemake/libraries	Tue Jan 27 02:20:35 2004
-@@ -96,7 +96,7 @@ case $PHASE in
+--- firemake/libraries.orig	2004-02-13 08:22:48.000000000 +0800
++++ firemake/libraries	2014-05-20 14:49:41.365576865 +0800
+@@ -98,10 +98,10 @@ case $PHASE in
+ 		$ECHO "install_libraries: $LIBRARYLIST"
+ 		for LIBRARY in $LIBRARIES; do
  			dispn "	$LIBRARY..."
- 			$ECHO "	$INSTALL ${LIBRARY}.a \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
- 			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
+-			$ECHO "	$INSTALL ${LIBRARY}.a \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
+-			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
 -			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so.$VERSION2"
-+			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so.0"
- 			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so"
+-			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so"
++			$ECHO "	$INSTALL ${LIBRARY}.a \$(DESTDIR)\$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(DESTDIR)\$(LIBDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(DESTDIR)\$(LIBDIR)/${LIBRARY}.so.0"
++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(DESTDIR)\$(LIBDIR)/${LIBRARY}.so"
  			disp "done"
  		done
+ 		$ECHO
diff --git a/dns/firedns/pkg-plist b/dns/firedns/pkg-plist
index ee9ad7bbf280..dd35783ccbc0 100644
--- a/dns/firedns/pkg-plist
+++ b/dns/firedns/pkg-plist
@@ -16,3 +16,47 @@ lib/libfiredns.a
 lib/libfiredns.so
 lib/libfiredns.so.0
 lib/libfiredns.so.0.9.12
+man/man1/fdnscname.1.gz
+man/man1/fdnsip.1.gz
+man/man1/fdnsip6.1.gz
+man/man1/fdnsip6list.1.gz
+man/man1/fdnsiplist.1.gz
+man/man1/fdnsmx.1.gz
+man/man1/fdnsmxalist.1.gz
+man/man1/fdnsmxlist.1.gz
+man/man1/fdnsname.1.gz
+man/man1/fdnsnamep.1.gz
+man/man1/fdnsspf1.1.gz
+man/man1/fdnstxt.1.gz
+man/man1/fdnstxtlist.1.gz
+man/man3/firedns_aton4.3.gz
+man/man3/firedns_aton6.3.gz
+man/man3/firedns_dnsbl_lookup.3.gz
+man/man3/firedns_free_mxalist.3.gz
+man/man3/firedns_getcname.3.gz
+man/man3/firedns_getip4.3.gz
+man/man3/firedns_getip4list.3.gz
+man/man3/firedns_getip6.3.gz
+man/man3/firedns_getip6list.3.gz
+man/man3/firedns_getmx.3.gz
+man/man3/firedns_getmxlist.3.gz
+man/man3/firedns_getname4.3.gz
+man/man3/firedns_getname6.3.gz
+man/man3/firedns_getresult.3.gz
+man/man3/firedns_gettxt.3.gz
+man/man3/firedns_gettxtlist.3.gz
+man/man3/firedns_ntoa4.3.gz
+man/man3/firedns_ntoa6.3.gz
+man/man3/firedns_resolvecname.3.gz
+man/man3/firedns_resolveip4.3.gz
+man/man3/firedns_resolveip4list.3.gz
+man/man3/firedns_resolveip6.3.gz
+man/man3/firedns_resolveip6list.3.gz
+man/man3/firedns_resolvemx.3.gz
+man/man3/firedns_resolvemxalist.3.gz
+man/man3/firedns_resolvemxlist.3.gz
+man/man3/firedns_resolvename4.3.gz
+man/man3/firedns_resolvename6.3.gz
+man/man3/firedns_resolvetxt.3.gz
+man/man3/firedns_resolvetxtlist.3.gz
+man/man3/libfiredns.3.gz