Support staging.

Approved by:	portmgr@

6 files changed, 122 insertions, 13 deletions

diff --git a/misc/firestring/files/patch-firemake::libraries b/misc/firestring/files/patch-firemake::libraries
deleted file mode 100644
index dc039d26dc8d..000000000000
--- a/misc/firestring/files/patch-firemake::libraries
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- firemake/libraries.orig	Tue Feb 24 13:37:56 2004
-+++ firemake/libraries	Sat May  1 20:10:38 2004
-@@ -100,7 +100,7 @@
- 			dispn "	$LIBRARY..."
- 			$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"
- 			disp "done"
- 		done
diff --git a/misc/firestring/files/patch-firemake__binaries b/misc/firestring/files/patch-firemake__binaries
new file mode 100644
index 000000000000..b162dbb9099e
--- /dev/null
+++ b/misc/firestring/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/misc/firestring/files/patch-firemake__headers b/misc/firestring/files/patch-firemake__headers
new file mode 100644
index 000000000000..8ff3fd26289b
--- /dev/null
+++ b/misc/firestring/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/misc/firestring/files/patch-firemake__libraries b/misc/firestring/files/patch-firemake__libraries
new file mode 100644
index 000000000000..053dd1f93087
--- /dev/null
+++ b/misc/firestring/files/patch-firemake__libraries
@@ -0,0 +1,17 @@
+--- firemake/libraries.orig	2004-02-25 03:37:56.000000000 +0800
++++ firemake/libraries	2014-05-20 14:41:35.994615240 +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 "	ln -sf ${LIBRARY}.so.$VERSION \$(LIBDIR)/${LIBRARY}.so.$VERSION2"
+-			$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/misc/firestring/files/patch-firemake::makefiletop b/misc/firestring/files/patch-firemake__makefiletop
index 2d7b73a3d412..2d7b73a3d412 100644
--- a/misc/firestring/files/patch-firemake::makefiletop
+++ b/misc/firestring/files/patch-firemake__makefiletop
diff --git a/misc/firestring/files/patch-firemake__man b/misc/firestring/files/patch-firemake__man
new file mode 100644
index 000000000000..b30a02896ab9
--- /dev/null
+++ b/misc/firestring/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