Attachment #25809 for bug #44085

View | Details | Raw Unified | Return to bug 44085
Collapse All | Expand All




# New ports collection makefile for:	firedns
# Date created:		Sun 12 May 22:30:00 WST 2002
# Whom:			Dean Hollister <dean@odyssey.apana.org.au>
#
# $FreeBSD$
#

PORTNAME=	firestring
PORTVERSION=	0.1.21
PORTREVISION=	1
CATEGORIES=	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=	${PORTNAME}
EXTRACT_SUFX=	-${PORTVERSION}.tar.gz

MAINTAINER=	dean@odyssey.apana.org.au

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_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>

Line 1 Link Here

(-)firestring/distinfo (-1 / +1 lines)
1	MD5 (firestring-0.1.19.tar.gz) = 550ca4388b785a1765ca1019d7142152	1	MD5 (firestring-0.1.21.tar.gz) = 24373e9973406af7dae65414534e4bed




--- 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 "LIBS := \$(LIBS) $INLIBS" >> Makefile
@@ -517,7 +517,7 @@
-$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.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
@@ -527,7 +527,7 @@
 $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.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
@@ -537,7 +537,7 @@
 $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.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
@@ -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
@@ -569,7 +569,7 @@
 	LS=`ls man/*.$SECTION 2>>configure.log`
 	if test "$LS" != ""; then
 		$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
@@ -596,7 +596,7 @@
@@ -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.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

Lines 6-12 Link Here

(-)firestring/pkg-descr (-1 / +1 lines)
6	libc functions. libfirestring also provides functions that	6	libc functions. libfirestring also provides functions that
7	are in most libc's but not provided for by POSIX, enabling	7	are in most libc's but not provided for by POSIX, enabling
8	programmers to write POSIX-compliant code while using such	8	programmers to write POSIX-compliant code while using such
9	safe functions (strcasecmp, strncasecmp, snprintf).	9	safe functions (strcasecmp, strncasecmp, snprintf)."
10		10
11	"libfirestring also includes functions for dealing with	11	"libfirestring also includes functions for dealing with
12	reading configuration files in an easy to program fashion."	12	reading configuration files in an easy to program fashion."

Lines 1-3 Link Here

(-)firestring/pkg-plist (-1 / +2 lines)
		1	include/firestring.h
1	lib/libfirestring.so	2	lib/libfirestring.so
		3	lib/libfirestring.so.0
2	lib/libfirestring.a	4	lib/libfirestring.a
3	include/firestring.h

Return to bug 44085

Lines 1-42 Link Here

(-)firestring/Makefile (-26 / +35 lines)
1	# New ports collection makefile for: firestring	1	# New ports collection makefile for: firedns
2	# Date created: Mon 13 May 14:30:00 WST 2002	2	# Date created: Sun 12 May 22:30:00 WST 2002
3	# Whom: Dean Hollister <dean@odyssey.apana.org.au>	3	# Whom: Dean Hollister <dean@odyssey.apana.org.au>
4	#	4	#
5	# $FreeBSD$	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= firestring	8	PORTNAME= firestring
9	PORTVERSION= 0.1.19	9	PORTVERSION= 0.1.21
10	CATEGORIES= misc	10	PORTREVISION= 1
		11	CATEGORIES= net
11	MASTER_SITES= http://ares.penguinhosting.net/~ian/projects/ \	12	MASTER_SITES= http://ares.penguinhosting.net/~ian/projects/ \
12	http://www.wa.apana.org.au/~dean/sources/ \	13	http://www.wa.apana.org.au/~dean/sources/ \
13	ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/	14	ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
14	DISTNAME= firestring	15	DISTNAME= ${PORTNAME}
15	EXTRACT_SUFX= -0.1.19.tar.gz	16	EXTRACT_SUFX= -${PORTVERSION}.tar.gz
16		17
17	MAINTAINER= dean@odyssey.apana.org.au	18	MAINTAINER= dean@odyssey.apana.org.au
18		19
19	GNU_CONFIGURE= yes	20	HAS_CONFIGURE= yes
20	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
21		22
22	MAN3= firestring_chomp.3 firestring_chug.3 \	23	MAN3= firestring_chomp.3 firestring_chug.3 firestring_concat.3 \
23	firestring_concat.3 firestring_conf_add.3 \	24	firestring_conf_add.3 firestring_conf_find.3 \
24	firestring_conf_find.3 firestring_conf_find_next.3 \	25	firestring_conf_find_next.3 firestring_conf_free.3 \
25	firestring_conf_free.3 firestring_conf_parse.3 \	26	firestring_conf_parse.3 firestring_estr_0.3 \
26	firestring_estr_0.3 firestring_estr_alloc.3 \	27	firestring_estr_alloc.3 firestring_estr_base64_decode.3 \
27	firestring_estr_ends.3 firestring_estr_estrcasecmp.3 \	28	firestring_estr_base64_encode.3 firestring_estr_ends.3 \
28	firestring_estr_estrcat.3 firestring_estr_estrcmp.3 \	29	firestring_estr_estrcasecmp.3 firestring_estr_estrcat.3 \
29	firestring_estr_estrcpy.3 firestring_estr_estristr.3 \	30	firestring_estr_estrcmp.3 firestring_estr_estrcpy.3 \
30	firestring_estr_estrncasecmp.3 firestring_estr_estrstr.3 \	31	firestring_estr_estristr.3 firestring_estr_estrncasecmp.3 \
31	firestring_estr_free.3 firestring_estr_read.3 \	32	firestring_estr_estrstr.3 firestring_estr_expand.3 \
32	firestring_estr_sprintf.3 firestring_estr_starts.3 \	33	firestring_estr_free.3 firestring_estr_read.3 \
33	firestring_estr_strcasecmp.3 firestring_estr_strcat.3 \	34	firestring_estr_sprintf.3 firestring_estr_starts.3 \
34	firestring_estr_strchr.3 firestring_estr_strcmp.3 \	35	firestring_estr_strcasecmp.3 firestring_estr_strcat.3 \
35	firestring_estr_strcpy.3 firestring_estr_stristr.3 \	36	firestring_estr_strchr.3 firestring_estr_strcmp.3 \
36	firestring_estr_strstr.3 firestring_malloc.3 \	37	firestring_estr_strcpy.3 firestring_estr_stristr.3 \
37	firestring_realloc.3 firestring_snprintf.3 \	38	firestring_estr_strstr.3 firestring_estr_xml_decode.3 \
38	firestring_strcasecmp.3 firestring_strdup.3 \	39	firestring_estr_xml_encode.3 firestring_hextoi.3 \
39	firestring_strncasecmp.3 firestring_strncat.3 \	40	firestring_malloc.3 firestring_realloc.3 \
40	firestring_strncpy.3 libfirestring.3	41	firestring_snprintf.3 firestring_strcasecmp.3 \
		42	firestring_strdup.3 firestring_strncasecmp.3 \
		43	firestring_strncat.3 firestring_strncpy.3 \
		44	libfirestring.3
		45
		46	post-install:
		47
		48	@cd ${PREFIX}/lib; ${MV} libfirestring.so libfirestring.so.0; \
		49	${LN} -s libfirestring.so.0 libfirestring.so
41		50
42	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-78 Link Here

(-)firestring/files/patch-configure (-50 / +28 lines)
1	--- configure.old Thu Aug 22 12:04:27 2002	1	--- configure.orig Sun Sep 22 06:37:40 2002
2	+++ configure Thu Aug 22 12:08:24 2002	2	+++ configure Tue Oct 15 17:22:58 2002
3	@@ -518,33 +518,33 @@	3	@@ -322,7 +322,7 @@
		4	$ECHO "INCLUDEDIR ?= \$(PREFIX)/include" >> Makefile
		5	$ECHO "MANDIR ?= \$(PREFIX)/man" >> Makefile
		6	$ECHO "CONFDIR ?= \$(PREFIX)/etc" >> Makefile
		7	-$ECHO "INSTALL_GROUP ?= root" >> Makefile
		8	+$ECHO "INSTALL_GROUP ?= wheel" >> Makefile
		9	$ECHO "INSTALL_USER ?= root" >> Makefile
4		10
5	$ECHO -n " adding rule to install binaries..."	11	$ECHO "LIBS := \$(LIBS) $INLIBS" >> Makefile
6	$ECHO "install-binaries: $BINARIES" >> Makefile	12	@@ -517,7 +517,7 @@
7	-$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
8	+$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
9	$ECHO "done"	13	$ECHO "done"
10	for BINARY in $BINARIES; do	14	for BINARY in $BINARIES; do
11	$ECHO -n " adding rule to install binary $BINARY..."	15	$ECHO -n " adding rule to install binary $BINARY..."
12	- $ECHO " install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile	16	- $ECHO " ./install.sh $BINARY \$(BINDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
13	+ $ECHO " install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile	17	+ $ECHO " ./install.sh $BINARY \$(PREFIX)/bin \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
14	$ECHO "done"	18	$ECHO "done"
15	done;	19	done;
16	$ECHO >> Makefile	20	$ECHO >> Makefile
17		21	@@ -527,7 +527,7 @@
18	$ECHO -n " adding rule to install static libraries..."
19	$ECHO "install-static: $STATIC" >> Makefile
20	-$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
21	+$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
22	$ECHO "done"	22	$ECHO "done"
23	for LIBRARY in $STATIC; do	23	for LIBRARY in $STATIC; do
24	$ECHO -n " adding rule to install static library $LIBRARY..."	24	$ECHO -n " adding rule to install static library $LIBRARY..."
25	- $ECHO " install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile	25	- $ECHO " ./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
26	+ $ECHO " install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile	26	+ $ECHO " ./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
27	$ECHO "done"	27	$ECHO "done"
28	done;	28	done;
29	$ECHO >> Makefile	29	$ECHO >> Makefile
30		30	@@ -537,7 +537,7 @@
31	$ECHO -n " adding rule to install shared libraries..."
32	$ECHO "install-shared: $STATIC" >> Makefile
33	-$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
34	+$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
35	$ECHO "done"	31	$ECHO "done"
36	for LIBRARY in $SHARED; do	32	for LIBRARY in $SHARED; do
37	$ECHO -n " adding rule to install shared library $LIBRARY..."	33	$ECHO -n " adding rule to install shared library $LIBRARY..."
38	- $ECHO " install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile	34	- $ECHO " ./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
39	+ $ECHO " install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile	35	+ $ECHO " ./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
40	$ECHO "done"
41	done;
42	$ECHO >> Makefile
43	@@ -561,10 +561,10 @@
44	$ECHO "no firemake.headers found"
45	fi
46	$ECHO "install-headers: $HEADERS" >> Makefile
47	-$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
48	+$ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
49	for HEADER in $HEADERS; do
50	$ECHO -n " adding rule to install header $HEADER..."
51	- $ECHO " install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
52	+ $ECHO " install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
53	$ECHO "done"	36	$ECHO "done"
54	done;	37	done;
55	$ECHO >> Makefile	38	$ECHO >> Makefile
56	@@ -576,8 +576,8 @@	39	@@ -569,7 +569,7 @@
57	LS=`ls man/*.$SECTION 2>>configure.log`
58	if test "$LS" != ""; then	40	if test "$LS" != ""; then
59	$ECHO "man/*.$SECTION" >> Makefile	41	$ECHO $LS >> Makefile
60	- $ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile	42	for MANPAGE in $LS; do
61	- $ECHO " install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile	43	- $ECHO " ./install.sh $MANPAGE \$(MANDIR)/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
62	+ $ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile	44	+ $ECHO " ./install.sh $MANPAGE \$(PREFIX)/man/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
63	+ $ECHO " install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile	45	done;
64	$ECHO "done"	46	$ECHO "done"
65	else	47	else
66	$ECHO >> Makefile	48	@@ -596,7 +596,7 @@
67	@@ -602,9 +602,9 @@
68	$ECHO -n "conf/$CONF " >> Makefile
69	done	49	done
70	$ECHO >> Makefile	50	$ECHO >> Makefile
71	- $ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
72	+ $ECHO " install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
73	for CONF in $CONFS; do	51	for CONF in $CONFS; do
74	- $ECHO " if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile	52	- $ECHO " if test ! -f \$(CONFDIR)/$CONF; then ./install.sh conf/$CONF \$(CONFDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
75	+ $ECHO " if test ! -f \$(PREFIX)/$etc; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile	53	+ $ECHO " if test ! -f \$(PREFIX)/etc/$CONF; then ./install.sh conf/$CONF \$(PREFIX)/etc \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
76	done	54	done
77	$ECHO "done"	55	$ECHO "done"
78	else	56	else