3 files changed, 97 insertions, 8 deletions
diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile
index 613f776af2d4..bad7a144221e 100644
--- a/misc/firestring/Makefile
+++ b/misc/firestring/Makefile
@@ -6,26 +6,37 @@
 #
 
 PORTNAME=	firestring
-PORTVERSION=	0.1.9
+PORTVERSION=	0.1.19
 CATEGORIES=	misc
 MASTER_SITES=	http://ares.penguinhosting.net/~ian/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 DISTNAME=	firestring
-EXTRACT_SUFX=	-0.1.9.tar.gz
+EXTRACT_SUFX=	-0.1.19.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
 
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3=		firestring_chomp.3 firestring_chug.3 \
 		firestring_concat.3 firestring_conf_add.3 \
 		firestring_conf_find.3 firestring_conf_find_next.3 \
 		firestring_conf_free.3 firestring_conf_parse.3 \
-		firestring_malloc.3 firestring_realloc.3 \
-		firestring_snprintf.3 firestring_strcasecmp.3 \
-		firestring_strdup.3 firestring_strncasecmp.3 \
-		firestring_strncat.3 firestring_strncpy.3 \
-		libfirestring.3
+      		firestring_estr_0.3 firestring_estr_alloc.3 \
+      		firestring_estr_ends.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_free.3 firestring_estr_read.3 \
+       		firestring_estr_sprintf.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_malloc.3 \
+       		firestring_realloc.3 firestring_snprintf.3 \
+       		firestring_strcasecmp.3 firestring_strdup.3 \
+       		firestring_strncasecmp.3 firestring_strncat.3 \
+      		firestring_strncpy.3 libfirestring.3
 
 .include <bsd.port.mk>
diff --git a/misc/firestring/distinfo b/misc/firestring/distinfo
index 16606e62a257..761f161769c5 100644
--- a/misc/firestring/distinfo
+++ b/misc/firestring/distinfo
@@ -1 +1 @@
-MD5 (firestring-0.1.9.tar.gz) = 77eceb12bc3466840db1b46c43738ee1
+MD5 (firestring-0.1.19.tar.gz) = 550ca4388b785a1765ca1019d7142152
diff --git a/misc/firestring/files/patch-configure b/misc/firestring/files/patch-configure
new file mode 100644
index 000000000000..590069f783d3
--- /dev/null
+++ b/misc/firestring/files/patch-configure
@@ -0,0 +1,78 @@
+--- configure.old	Thu Aug 22 12:04:27 2002
++++ configure	Thu Aug 22 12:08:24 2002
+@@ -518,33 +518,33 @@
+ 
+ $ECHO -n "	adding rule to install binaries..."
+ $ECHO "install-binaries: $BINARIES" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
+ $ECHO "done"
+ for BINARY in $BINARIES; do
+ 	$ECHO -n "	adding rule to install binary $BINARY..."
+-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile
++	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile
+ 	$ECHO "done"
+ done;
+ $ECHO >> Makefile
+ 
+ $ECHO -n "	adding rule to install static libraries..."
+ $ECHO "install-static: $STATIC" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
+ $ECHO "done"
+ for LIBRARY in $STATIC; do
+ 	$ECHO -n "	adding rule to install static library $LIBRARY..."
+-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
++	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
+ 	$ECHO "done"
+ done;
+ $ECHO >> Makefile
+ 
+ $ECHO -n "	adding rule to install shared libraries..."
+ $ECHO "install-shared: $STATIC" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
+ $ECHO "done"
+ for LIBRARY in $SHARED; do
+ 	$ECHO -n "	adding rule to install shared library $LIBRARY..."
+-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
++	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
+ 	$ECHO "done"
+ done;
+ $ECHO >> Makefile
+@@ -561,10 +561,10 @@
+ 	$ECHO "no firemake.headers found"
+ fi
+ $ECHO "install-headers: $HEADERS" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
+ for HEADER in $HEADERS; do
+ 	$ECHO -n "	adding rule to install header $HEADER..."
+-	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
++	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
+ 	$ECHO "done"
+ done;
+ $ECHO >> Makefile
+@@ -576,8 +576,8 @@
+ 	LS=`ls man/*.$SECTION 2>>configure.log`
+ 	if test "$LS" != ""; then
+ 		$ECHO "man/*.$SECTION" >> Makefile
+-		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile
+-		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile
++		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile
++		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile
+ 		$ECHO "done"
+ 	else
+ 		$ECHO >> Makefile
+@@ -602,9 +602,9 @@
+ 		$ECHO -n "conf/$CONF " >> Makefile
+ 	done
+ 	$ECHO >> Makefile
+-	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
++	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
+ 	for CONF in $CONFS; do
+-		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile
++		$ECHO "	if test ! -f \$(PREFIX)/$etc; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile
+ 	done
+ 	$ECHO "done"
+ else