Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Jan 2004 14:14:28 +0800 (WST)
From:      Dean Hollister <dean@odyssey.apana.org.au>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/61822: Upgraded Port: misc/firestring to 0.9.9
Message-ID:  <200401240614.OAA93431@odyssey.apana.org.au>
Resent-Message-ID: <200401240620.i0O6KDxv029447@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         61822
>Category:       ports
>Synopsis:       Upgraded Port: misc/firestring to 0.9.9
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 23 22:20:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dean Hollister
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
Australian Public Access Network Association Inc
>Environment:
System: FreeBSD odyssey.apana.org.au 4.9-STABLE FreeBSD 4.9-STABLE #0: Fri Oct 31 19:17:50 WST 2003 root@odyssey.apana.org.au:/usr/obj/usr/src/sys/ODYSSEY i386
>Description:
Upgraded Port: misc/firestring to 0.9.9. New version released.
>How-To-Repeat:
>Fix:
diff -ruN firestring.orig/Makefile firestring/Makefile
--- firestring.orig/Makefile	Tue Nov 11 19:42:23 2003
+++ firestring/Makefile	Sat Jan 24 14:07:41 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firestring
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.9
 CATEGORIES=	misc net devel
 MASTER_SITES=	http://firestuff.org/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
@@ -20,44 +20,44 @@
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-MAN3=		firestring_chomp.3 firestring_estr_munch.3 \
-		firestring_chug.3 firestring_estr_read.3 \
-		firestring_concat.3 firestring_estr_replace.3 \
-		firestring_conf_add.3 firestring_estr_sprintf.3 \
-		firestring_conf_delete.3 firestring_estr_starts.3 \
-		firestring_conf_find.3 firestring_estr_strcasecmp.3 \
-		firestring_conf_find_next.3 firestring_estr_strcat.3 \
-		firestring_conf_free.3 firestring_estr_strchr.3 \
-		firestring_conf_parse.3 firestring_estr_strcmp.3 \
-		firestring_conf_parse_next.3 \
-		firestring_estr_strcpy.3 \
-		firestring_estr_0.3 firestring_estr_stristr.3 \
-		firestring_estr_aestrcat.3 firestring_estr_strstr.3 \
-		firestring_estr_aestrcpy.3 firestring_estr_tolower.3 \
-		firestring_estr_alloc.3 firestring_estr_toupper.3 \
-		firestring_estr_areplace.3 firestring_estr_trim.3 \
-		firestring_estr_astrcat.3 firestring_estr_vsprintf.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_xml_decode.3 \
 		firestring_estr_base64_decode.3 \
-		firestring_estr_xml_encode.3 \
-		firestring_estr_base64_encode.3 firestring_fprintf.3 \
-		firestring_estr_chomp.3 firestring_hextoi.3 \
-		firestring_estr_chug.3 firestring_malloc.3 \
-		firestring_estr_ends.3 firestring_printf.3 \
-		firestring_estr_estrcasecmp.3 firestring_realloc.3 \
-		firestring_estr_estrcat.3 \
-		firestring_set_error_handler.3 \
-		firestring_estr_estrcmp.3 firestring_snprintf.3 \
-		firestring_estr_estrcpy.3 firestring_strcasecmp.3 \
-		firestring_estr_estristr.3 firestring_strdup.3 \
-		firestring_estr_estrncasecmp.3 \
-		firestring_strncasecmp.3 \
-		firestring_estr_estrstr.3 firestring_strncat.3 \
-		firestring_estr_expand.3 firestring_strncpy.3 \
-		firestring_estr_free.3 firestring_trim.3 \
-		firestring_estr_ip_chug.3 firestring_vfprintf.3 \
-		firestring_estr_ip_trim.3 libfirestring.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
+
+post-patch:
+	${RM} ${WRKSRC}/firemake/*.orig
 
 post-install:
 	@cd ${PREFIX}/lib; ${MV} libfirestring.so libfirestring.so.0; \
diff -ruN firestring.orig/distinfo firestring/distinfo
--- firestring.orig/distinfo	Tue Nov 11 19:42:23 2003
+++ firestring/distinfo	Sat Jan 24 13:51:43 2004
@@ -1 +1 @@
-MD5 (firestring-0.9.6.tar.gz) = 398c841107aed4226824bde5af2bc272
+MD5 (firestring-0.9.9.tar.gz) = daaf1f1f504a85afc508e21bc53d4e9a
diff -ruN firestring.orig/files/patch-binaries firestring/files/patch-binaries
--- firestring.orig/files/patch-binaries	Thu Jan  1 08:00:00 1970
+++ firestring/files/patch-binaries	Sat Jan 24 13:59:39 2004
@@ -0,0 +1,26 @@
+--- firemake/binaries.orig	Sat Jan 24 13:52:53 2004
++++ firemake/binaries	Sat Jan 24 13:53:43 2004
+@@ -52,9 +52,9 @@
+ 				disp "	skipping $BINARY"
+ 			else
+ 				dispn "	$BINARY..."
+-				$ECHO "	$INSTALL $BINARY \$(BINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++				$ECHO "	$INSTALL $BINARY \$(PREFIX)/bin $INSTALL_USER $INSTALL_GROUP 0755"
+ 				if test "$STRIP" != ""; then
+-					$ECHO "	$STRIP \$(BINDIR)/$BINARY"
++					$ECHO "	$STRIP \$(PREFIX)/bin/$BINARY"
+ 				fi
+ 				disp "done"
+ 			fi
+@@ -65,9 +65,9 @@
+ 				disp "	skipping $BINARY"
+ 			else
+ 				dispn "	$BINARY..."
+-				$ECHO "	$INSTALL $BINARY \$(SBINDIR) $INSTALL_USER $INSTALL_GROUP 0755"
++				$ECHO "	$INSTALL $BINARY \$(PREFIX)/sbin $INSTALL_USER $INSTALL_GROUP 0755"
+ 				if test "$STRIP" != ""; then
+-					$ECHO "	$STRIP \$(SBINDIR)/$BINARY"
++					$ECHO "	$STRIP \$(PREFIX)/sbin/$BINARY"
+ 				fi
+ 				disp "done"
+ 			fi
diff -ruN firestring.orig/files/patch-headers firestring/files/patch-headers
--- firestring.orig/files/patch-headers	Thu Jan  1 08:00:00 1970
+++ firestring/files/patch-headers	Sat Jan 24 13:59:47 2004
@@ -0,0 +1,11 @@
+--- firemake/headers.orig	Sat Jan 24 13:55:02 2004
++++ firemake/headers	Sat Jan 24 13:55:21 2004
+@@ -16,7 +16,7 @@
+ 		$ECHO "install_headers:"
+ 
+ 		for HEADER in $HEADERS; do
+-			$ECHO "	$INSTALL $HEADER \$(INCLUDEDIR) $INSTALL_USER $INSTALL_GROUP 0644"
++			$ECHO "	$INSTALL $HEADER \$(PREFIX)/include $INSTALL_USER $INSTALL_GROUP 0644"
+ 		done
+ 		$ECHO
+ 
diff -ruN firestring.orig/files/patch-libraries firestring/files/patch-libraries
--- firestring.orig/files/patch-libraries	Thu Jan  1 08:00:00 1970
+++ firestring/files/patch-libraries	Sat Jan 24 13:59:59 2004
@@ -0,0 +1,17 @@
+--- firemake/libraries.orig	Sat Jan 24 13:56:08 2004
++++ firemake/libraries	Sat Jan 24 13:56:54 2004
+@@ -94,10 +94,10 @@
+ 		$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 \$(PREFIX)/lib $INSTALL_USER $INSTALL_GROUP 0755"
++			$ECHO "	$INSTALL ${LIBRARY}.so.$VERSION \$(PREFIX)/lib $INSTALL_USER $INSTALL_GROUP 0755"
++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(PREFIX)/lib/${LIBRARY}.so.$VERSION2"
++			$ECHO "	ln -sf ${LIBRARY}.so.$VERSION \$(PREFIX)/lib/${LIBRARY}.so"
+ 			disp "done"
+ 		done
+ 		$ECHO
diff -ruN firestring.orig/files/patch-man firestring/files/patch-man
--- firestring.orig/files/patch-man	Thu Jan  1 08:00:00 1970
+++ firestring/files/patch-man	Sat Jan 24 14:00:06 2004
@@ -0,0 +1,56 @@
+--- firemake/man.orig	Sat Jan 24 13:57:19 2004
++++ firemake/man	Sat Jan 24 13:58:22 2004
+@@ -38,7 +38,7 @@
+ 		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 \$(PREFIX)/man/man1 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -46,7 +46,7 @@
+ 		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 \$(PREFIX)/man/man3 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -54,7 +54,7 @@
+ 		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 \$(PREFIX)/man/man5 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -62,7 +62,7 @@
+ 		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 \$(PREFIX)/man/man6 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -70,7 +70,7 @@
+ 		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 \$(PREFIX)/man/man7 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
+@@ -78,7 +78,7 @@
+ 		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 \$(PREFIX)/man/man8 $INSTALL_USER $INSTALL_GROUP 0644"
+ 			done
+ 			disp "done"
+ 		fi
diff -ruN firestring.orig/pkg-plist firestring/pkg-plist
--- firestring.orig/pkg-plist	Tue Nov 11 19:42:23 2003
+++ firestring/pkg-plist	Sat Jan 24 14:09:41 2004
@@ -1,6 +1,6 @@
 @comment $FreeBSD: ports/misc/firestring/pkg-plist,v 1.3 2003/11/09 01:13:22 jeh Exp $
 lib/libfirestring.a
-lib/libfirestring.so.0.9.6
+lib/libfirestring.so.0.9.9
 lib/libfirestring.so.0.9
 lib/libfirestring.so
 include/firestring.h
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401240614.OAA93431>