- update to 0.9.12

- unbreak: don't write in /usr/lib
- use bzip2
- depend on gcc3
- update pkg-descr & WWW: tag

PR:		65951
Submitted by:	maintainer

6 files changed, 82 insertions, 52 deletions

diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile
index f6bef3bb4555..e97abe1ed62f 100644
--- a/misc/firestring/Makefile
+++ b/misc/firestring/Makefile
@@ -6,62 +6,67 @@
 #
 
 PORTNAME=	firestring
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.12
 CATEGORIES=	misc net devel
-MASTER_SITES=	http://firestuff.org/projects/ \
+MASTER_SITES=	http://www.firestuff.org/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	A library to make string handling easier in C
 
-BROKEN=		"Installs libraries into /usr/lib"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2004-06-18
-
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	PREFIX="${PREFIX}"
 INSTALLS_SHLIB=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+USE_GCC=	3.2
+.else
+USE_GCC=	yes
+.endif
+
 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_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_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_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_xml_decode.3 \
-		firestring_estr_xml_encode.3 firestring_fprintf.3 \
-		firestring_hextoi.3 firestring_malloc.3 \
-		firestring_printf.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 libfirestring.3
+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.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/firestring/distinfo b/misc/firestring/distinfo
index 778082346a90..e532f4189e0a 100644
--- a/misc/firestring/distinfo
+++ b/misc/firestring/distinfo
@@ -1,2 +1,2 @@
-MD5 (firestring-0.9.9.tar.gz) = daaf1f1f504a85afc508e21bc53d4e9a
-SIZE (firestring-0.9.9.tar.gz) = 34196
+MD5 (firestring-0.9.12.tar.bz2) = f64e658a07894ed86ce899a4469c523a
+SIZE (firestring-0.9.12.tar.bz2) = 30735
diff --git a/misc/firestring/files/patch-firemake::libraries b/misc/firestring/files/patch-firemake::libraries
new file mode 100644
index 000000000000..dc039d26dc8d
--- /dev/null
+++ b/misc/firestring/files/patch-firemake::libraries
@@ -0,0 +1,13 @@
+$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::makefiletop b/misc/firestring/files/patch-firemake::makefiletop
new file mode 100644
index 000000000000..2d7b73a3d412
--- /dev/null
+++ b/misc/firestring/files/patch-firemake::makefiletop
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- firemake/makefiletop.orig	Sat May  1 20:12:10 2004
++++ firemake/makefiletop	Sat May  1 20:11:26 2004
+@@ -3,7 +3,7 @@
+ #require make
+ #phase makefile
+ dispn "Writing Makefile top entries..."
+-if test "$MAKE_CONDSET" = "y"; then
++if test "$MAKE_CONDSET" = "never"; then
+ 	$ECHO "PREFIX ?= $FM_PREFIX"
+ 
+ 	if test "$FM_MANDIRSTRICT" = "y"; then
diff --git a/misc/firestring/pkg-descr b/misc/firestring/pkg-descr
index 22619749c048..e84eea197323 100644
--- a/misc/firestring/pkg-descr
+++ b/misc/firestring/pkg-descr
@@ -6,15 +6,14 @@ are in most libc's but not provided for by ANSI C, enabling
 programmers to write ANSI C-compliant code while using such
 safe functions (strcasecmp, strncasecmp, snprintf).
 
-libfirestring provides a set of functions for dealing with
-EStrings.  EStrings are binary-safe objects that, when used
-with the firestring functions, are overflow safe, because
-they include allocated memory size information with them.
-
 libfirestring also includes functions for dealing with
 reading configuration files in an easy to program fashion.
 
-WWW:	http://firestuff.org/
+This library uses long long, which is part of the C99 standard
+(previously a GNU extension).	Your compiler needs to support
+this in order for FireString to work.
+
+WWW: http://www.firestuff.org/
 
 - Dean
 dean@odyssey.apana.org.au
diff --git a/misc/firestring/pkg-plist b/misc/firestring/pkg-plist
index a013b0305883..0702dad97194 100644
--- a/misc/firestring/pkg-plist
+++ b/misc/firestring/pkg-plist
@@ -3,4 +3,4 @@ include/firestring.h
 lib/libfirestring.a
 lib/libfirestring.so
 lib/libfirestring.so.0
-lib/libfirestring.so.0.9.9
+lib/libfirestring.so.0.9.12