8 files changed, 197 insertions, 55 deletions

diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile
index 6c5bf7e6db36..afb9b2eb9dd8 100644
--- a/misc/firestring/Makefile
+++ b/misc/firestring/Makefile
@@ -11,53 +11,13 @@ MASTER_SITES=	http://www.firestuff.org/projects/ \
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	A library to make string handling easier in C
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN3=	firestring_chomp.3 firestring_chug.3 firestring_concat.3 \
-	firestring_conf_add.3 firestring_conf_delete.3 \
-	firestring_conf_find.3 firestring_conf_find_next.3 \
-	firestring_conf_free.3 firestring_conf_parse.3 \
-	firestring_conf_parse_next.3 firestring_estr_0.3 \
-	firestring_estr_aestrcat.3 firestring_estr_aestrcpy.3 \
-	firestring_estr_alloc.3 firestring_estr_areplace.3 \
-	firestring_estr_astrcat.3 firestring_estr_astrcpy.3 \
-	firestring_estr_base64_decode.3 firestring_estr_base64_encode.3 \
-	firestring_estr_chomp.3 firestring_estr_chug.3 \
-	firestring_estr_eends.3 firestring_estr_ends.3 \
-	firestring_estr_estarts.3 firestring_estr_estrcasecmp.3 \
-	firestring_estr_estrcat.3 firestring_estr_estrcmp.3 \
-	firestring_estr_estrcpy.3 firestring_estr_estristr.3 \
-	firestring_estr_estrncasecmp.3 firestring_estr_estrstr.3 \
-	firestring_estr_expand.3 firestring_estr_free.3 \
-	firestring_estr_ip_chug.3 firestring_estr_ip_trim.3 \
-	firestring_estr_munch.3 firestring_estr_read.3 \
-	firestring_estr_replace.3 firestring_estr_sprintf.3 \
-	firestring_estr_sprintfe.3 firestring_estr_starts.3 \
-	firestring_estr_strcasecmp.3 firestring_estr_strcat.3 \
-	firestring_estr_strchr.3 firestring_estr_strcmp.3 \
-	firestring_estr_strcpy.3 firestring_estr_stristr.3 \
-	firestring_estr_strstr.3 firestring_estr_tolower.3 \
-	firestring_estr_toupper.3 firestring_estr_trim.3 \
-	firestring_estr_vsprintf.3 firestring_estr_vsprintfe.3 \
-	firestring_estr_xml_decode.3 firestring_estr_xml_encode.3 \
-	firestring_fprintf.3 firestring_fprintfe.3 \
-	firestring_hextoi.3 firestring_malloc.3 firestring_printf.3 \
-	firestring_printfe.3 firestring_realloc.3 \
-	firestring_set_error_handler.3 firestring_snprintf.3 \
-	firestring_strcasecmp.3 firestring_strdup.3 \
-	firestring_strncasecmp.3 firestring_strncat.3 \
-	firestring_strncpy.3 firestring_trim.3 \
-	firestring_vfprintf.3 firestring_vfprintfe.3 \
-	libfirestring.3
-
 pre-configure:
 	@-${RM} ${WRKSRC}/firemake/*.orig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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
diff --git a/misc/firestring/pkg-plist b/misc/firestring/pkg-plist
index 41475cac82d2..2a4646a6ff4f 100644
--- a/misc/firestring/pkg-plist
+++ b/misc/firestring/pkg-plist
@@ -3,3 +3,76 @@ lib/libfirestring.a
 lib/libfirestring.so
 lib/libfirestring.so.0
 lib/libfirestring.so.0.9.12
+man/man3/firestring_chomp.3.gz
+man/man3/firestring_chug.3.gz
+man/man3/firestring_concat.3.gz
+man/man3/firestring_conf_add.3.gz
+man/man3/firestring_conf_delete.3.gz
+man/man3/firestring_conf_find.3.gz
+man/man3/firestring_conf_find_next.3.gz
+man/man3/firestring_conf_free.3.gz
+man/man3/firestring_conf_parse.3.gz
+man/man3/firestring_conf_parse_next.3.gz
+man/man3/firestring_estr_0.3.gz
+man/man3/firestring_estr_aestrcat.3.gz
+man/man3/firestring_estr_aestrcpy.3.gz
+man/man3/firestring_estr_alloc.3.gz
+man/man3/firestring_estr_areplace.3.gz
+man/man3/firestring_estr_astrcat.3.gz
+man/man3/firestring_estr_astrcpy.3.gz
+man/man3/firestring_estr_base64_decode.3.gz
+man/man3/firestring_estr_base64_encode.3.gz
+man/man3/firestring_estr_chomp.3.gz
+man/man3/firestring_estr_chug.3.gz
+man/man3/firestring_estr_eends.3.gz
+man/man3/firestring_estr_ends.3.gz
+man/man3/firestring_estr_estarts.3.gz
+man/man3/firestring_estr_estrcasecmp.3.gz
+man/man3/firestring_estr_estrcat.3.gz
+man/man3/firestring_estr_estrcmp.3.gz
+man/man3/firestring_estr_estrcpy.3.gz
+man/man3/firestring_estr_estristr.3.gz
+man/man3/firestring_estr_estrncasecmp.3.gz
+man/man3/firestring_estr_estrstr.3.gz
+man/man3/firestring_estr_expand.3.gz
+man/man3/firestring_estr_free.3.gz
+man/man3/firestring_estr_ip_chug.3.gz
+man/man3/firestring_estr_ip_trim.3.gz
+man/man3/firestring_estr_munch.3.gz
+man/man3/firestring_estr_read.3.gz
+man/man3/firestring_estr_replace.3.gz
+man/man3/firestring_estr_sprintf.3.gz
+man/man3/firestring_estr_sprintfe.3.gz
+man/man3/firestring_estr_starts.3.gz
+man/man3/firestring_estr_strcasecmp.3.gz
+man/man3/firestring_estr_strcat.3.gz
+man/man3/firestring_estr_strchr.3.gz
+man/man3/firestring_estr_strcmp.3.gz
+man/man3/firestring_estr_strcpy.3.gz
+man/man3/firestring_estr_stristr.3.gz
+man/man3/firestring_estr_strstr.3.gz
+man/man3/firestring_estr_tolower.3.gz
+man/man3/firestring_estr_toupper.3.gz
+man/man3/firestring_estr_trim.3.gz
+man/man3/firestring_estr_vsprintf.3.gz
+man/man3/firestring_estr_vsprintfe.3.gz
+man/man3/firestring_estr_xml_decode.3.gz
+man/man3/firestring_estr_xml_encode.3.gz
+man/man3/firestring_fprintf.3.gz
+man/man3/firestring_fprintfe.3.gz
+man/man3/firestring_hextoi.3.gz
+man/man3/firestring_malloc.3.gz
+man/man3/firestring_printf.3.gz
+man/man3/firestring_printfe.3.gz
+man/man3/firestring_realloc.3.gz
+man/man3/firestring_set_error_handler.3.gz
+man/man3/firestring_snprintf.3.gz
+man/man3/firestring_strcasecmp.3.gz
+man/man3/firestring_strdup.3.gz
+man/man3/firestring_strncasecmp.3.gz
+man/man3/firestring_strncat.3.gz
+man/man3/firestring_strncpy.3.gz
+man/man3/firestring_trim.3.gz
+man/man3/firestring_vfprintf.3.gz
+man/man3/firestring_vfprintfe.3.gz
+man/man3/libfirestring.3.gz