5 files changed, 64 insertions, 77 deletions

diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile
index bad7a144221e..8f4fe5820509 100644
--- a/misc/firestring/Makefile
+++ b/misc/firestring/Makefile
@@ -6,37 +6,44 @@
 #
 
 PORTNAME=	firestring
-PORTVERSION=	0.1.19
-CATEGORIES=	misc
+PORTVERSION=	0.1.21
+CATEGORIES=	misc net
 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.19.tar.gz
+DISTNAME=	${PORTNAME}
+EXTRACT_SUFX=	-${PORTVERSION}.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
 
-GNU_CONFIGURE=	yes
+HAS_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_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
+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_estr_0.3 \
+		firestring_estr_alloc.3 firestring_estr_base64_decode.3 \
+		firestring_estr_base64_encode.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_expand.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_estr_xml_decode.3 \
+		firestring_estr_xml_encode.3 firestring_hextoi.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
+
+post-install:
+	@cd ${PREFIX}/lib; ${MV} libfirestring.so libfirestring.so.0; \
+	${LN} -s libfirestring.so.0 libfirestring.so
 
 .include <bsd.port.mk>
diff --git a/misc/firestring/distinfo b/misc/firestring/distinfo
index 761f161769c5..d1ddc3585867 100644
--- a/misc/firestring/distinfo
+++ b/misc/firestring/distinfo
@@ -1 +1 @@
-MD5 (firestring-0.1.19.tar.gz) = 550ca4388b785a1765ca1019d7142152
+MD5 (firestring-0.1.21.tar.gz) = 24373e9973406af7dae65414534e4bed
diff --git a/misc/firestring/files/patch-configure b/misc/firestring/files/patch-configure
index 590069f783d3..45cd38f77814 100644
--- a/misc/firestring/files/patch-configure
+++ b/misc/firestring/files/patch-configure
@@ -1,78 +1,56 @@
---- configure.old	Thu Aug 22 12:04:27 2002
-+++ configure	Thu Aug 22 12:08:24 2002
-@@ -518,33 +518,33 @@
+--- configure.orig	Sun Sep 22 06:37:40 2002
++++ configure	Tue Oct 15 17:22:58 2002
+@@ -322,7 +322,7 @@
+ $ECHO "INCLUDEDIR ?= \$(PREFIX)/include" >> Makefile
+ $ECHO "MANDIR ?= \$(PREFIX)/man" >> Makefile
+ $ECHO "CONFDIR ?= \$(PREFIX)/etc" >> Makefile
+-$ECHO "INSTALL_GROUP ?= root" >> Makefile
++$ECHO "INSTALL_GROUP ?= wheel" >> Makefile
+ $ECHO "INSTALL_USER ?= root" >> Makefile
  
- $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 "LIBS := \$(LIBS) $INLIBS" >> Makefile
+@@ -517,7 +517,7 @@
  $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 "	./install.sh $BINARY \$(BINDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
++	$ECHO "	./install.sh $BINARY \$(PREFIX)/bin \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> 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
+@@ -527,7 +527,7 @@
  $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 "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
++	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> 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
+@@ -537,7 +537,7 @@
  $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 "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
++	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
-@@ -576,8 +576,8 @@
- 	LS=`ls man/*.$SECTION 2>>configure.log`
+@@ -569,7 +569,7 @@
  	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 $LS >> Makefile
+ 		for MANPAGE in $LS; do
+-			$ECHO "	./install.sh $MANPAGE \$(MANDIR)/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
++			$ECHO "	./install.sh $MANPAGE \$(PREFIX)/man/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
+ 		done;
  		$ECHO "done"
  	else
- 		$ECHO >> Makefile
-@@ -602,9 +602,9 @@
- 		$ECHO -n "conf/$CONF " >> Makefile
+@@ -596,7 +596,7 @@
  	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
+-		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then ./install.sh conf/$CONF \$(CONFDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
++		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then ./install.sh conf/$CONF \$(PREFIX)/etc \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
  	done
  	$ECHO "done"
  else
diff --git a/misc/firestring/pkg-descr b/misc/firestring/pkg-descr
index a276533124dd..01a41c189b30 100644
--- a/misc/firestring/pkg-descr
+++ b/misc/firestring/pkg-descr
@@ -6,7 +6,7 @@ Several functions provide saner interfaces than the standard
 libc functions.  libfirestring also provides functions that
 are in most libc's but not provided for by POSIX, enabling
 programmers to write POSIX-compliant code while using such
-safe functions (strcasecmp, strncasecmp, snprintf).
+safe functions (strcasecmp, strncasecmp, snprintf)."
 
 "libfirestring also includes functions for dealing with
 reading configuration files in an easy to program fashion."
diff --git a/misc/firestring/pkg-plist b/misc/firestring/pkg-plist
index 011c570ea576..cf57d54da61f 100644
--- a/misc/firestring/pkg-plist
+++ b/misc/firestring/pkg-plist
@@ -1,3 +1,5 @@
+@comment $FreeBSD$
+include/firestring.h
 lib/libfirestring.so
+lib/libfirestring.so.0
 lib/libfirestring.a
-include/firestring.h