Attachment #35187 for bug #56860

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




#

PORTNAME=	amap
PORTVERSION=	4.3
CATEGORIES=	security
MASTER_SITES=	http://www.thc.org/releases/



MAN1=		amap.1

post-patch:
	${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/amap.h

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin

	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
.	if !defined(NOPORTDOCS)
		${MKDIR} ${DOCSDIR}
.		for i in README TODO CHANGES VOTE
			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
.		endfor
.	endif

Line 1 Link Here

(-)amap/distinfo (-1 / +1 lines)
1	MD5 (amap-4.2.tar.gz) = ec781fe4ed97d8d3fcccf64951aefa3e	1	MD5 (amap-4.3.tar.gz) = 36e59ff9dfc60effde6dab6235d2029f




--- Makefile.am.orig	Sun Sep 14 11:04:11 2003
+++ Makefile.am	Sun Sep 14 11:05:29 2003
@@ -1,6 +1,5 @@
-CC=gcc
 LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-OPT=-O2
+OPT=${CFLAGS}
 OPT_DEBUG=-ggdb -Wall -lefence
 DIR=/bin
+DIR=${PREFIX}/bin
 SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
 MANPAGE=amap.1
 all:	pcre strip

Lines 1-11 Link Here

(-)amap/files/patch-amap.h (-8 / +8 lines)
1	--- amap.h.orig Tue Aug 5 21:18:29 2003	1	--- amap.h.orig Sun Sep 14 11:25:16 2003
2	+++ amap.h Wed Aug 13 11:48:47 2003	2	+++ amap.h Sun Sep 14 11:25:29 2003
3	@@ -24,7 +24,7 @@	3	@@ -33,7 +33,7 @@
4	#define AMAP_EMAIL "amap-dev@thc.org"	4	#endif
5	#define AMAP_RESOURCE "www.thc.org"	5	#endif
6		6
7	-#define AMAP_APPDEF_PATH "/usr/local/bin"	7	-#define AMAP_APPDEF_PATH AMAP_PREFIX"/bin"
8	+#define AMAP_APPDEF_PATH "PREFIX/share/amap"	8	+#define AMAP_APPDEF_PATH AMAP_PREFIX"/share/amap"
9	#define AMAP_BUFSIZE 1024 // standard buffer size	9	#define AMAP_BUFSIZE 1024 // standard buffer size
10	#define AMAP_BUFSIZE_BIG 65536 // big standard buffer size	10	#define AMAP_BUFSIZE_BIG 65536 // big standard buffer size
11	#define AMAP_REGEX_OPTIONS ( PCRE_MULTILINE \| PCRE_CASELESS )	11	#define AMAP_REGEX_OPTIONS ( PCRE_MULTILINE \| PCRE_CASELESS \| PCRE_DOTALL )




--- configure.orig	Sun Sep 14 11:10:24 2003
+++ configure	Sun Sep 14 11:16:41 2003
@@ -33,7 +33,9 @@
 echo
 
 echo "Checking for openssl ..."
-for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
+# FreeBSD: Try port version of openssl first. LIBDIRS is irrelevant for us
+# Since we don't have /etc/ld.so.conf
+for i in ${PREFIX}/lib $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
 /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
 /*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib
 do
@@ -61,7 +63,8 @@
     fi
 done
 
-for i in /usr/local/include /*ssl/include /usr/include \
+# FreeBSD: Change to prefer installed port over base-system openssl.
+for i in ${PREFIX}/include /usr/local/include /*ssl/include /usr/include \
 /opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include
 do
     if [ "X" = "X$SSL_IPATH" ]; then
@@ -152,7 +155,7 @@
     XLIBS="$XLIBS -lresolv"
 fi
 
-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
+for i in ${PREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
   if [ -d $i ]; then
     MANDIR=$i
   fi

Lines 5-14 Link Here

(-)amap/pkg-plist (-2 lines)
5	share/amap/appdefs.rpc	5	share/amap/appdefs.rpc
6	share/amap/appdefs.trig	6	share/amap/appdefs.trig
7	%%PORTDOCS%%%%DOCSDIR%%/README	7	%%PORTDOCS%%%%DOCSDIR%%/README
8	%%PORTDOCS%%%%DOCSDIR%%/IGNORE
9	%%PORTDOCS%%%%DOCSDIR%%/VOTE	8	%%PORTDOCS%%%%DOCSDIR%%/VOTE
10	%%PORTDOCS%%%%DOCSDIR%%/TODO	9	%%PORTDOCS%%%%DOCSDIR%%/TODO
11	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	10	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
12	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
13	%%PORTDOCS%%@dirrm %%DOCSDIR%%	11	%%PORTDOCS%%@dirrm %%DOCSDIR%%
14	@dirrm share/amap	12	@dirrm share/amap

Return to bug 56860

Lines 6-12 Link Here

(-)amap/Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= amap	8	PORTNAME= amap
9	PORTVERSION= 4.2	9	PORTVERSION= 4.3
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://www.thc.org/releases/	11	MASTER_SITES= http://www.thc.org/releases/
12		12
Lines 18-26 Link Here
18		18
19	MAN1= amap.1	19	MAN1= amap.1
20		20
21	post-patch:
22	${REINPLACE_CMD} -e 's\|PREFIX\|${PREFIX}\|' ${WRKSRC}/amap.h
23
24	do-install:	21	do-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin	22	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin
26	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin	23	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin
Lines 31-37 Link Here
31	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1	28	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
32	. if !defined(NOPORTDOCS)	29	. if !defined(NOPORTDOCS)
33	${MKDIR} ${DOCSDIR}	30	${MKDIR} ${DOCSDIR}
34	. for i in README TODO CHANGES LICENSE IGNORE VOTE	31	. for i in README TODO CHANGES VOTE
35	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}	32	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
36	. endfor	33	. endfor
37	. endif	34	. endif

Lines 1-13 Link Here

(-)amap/files/patch-Makefile.am (-7 / +4 lines)
1	--- Makefile.am.orig Mon Jul 14 21:38:18 2003	1	--- Makefile.am.orig Sun Sep 14 11:04:11 2003
2	+++ Makefile.am Wed Aug 13 15:14:22 2003	2	+++ Makefile.am Sun Sep 14 11:05:29 2003
3	@@ -1,8 +1,7 @@	3	@@ -1,6 +1,5 @@
4	-CC=gcc	4	-CC=gcc
5	LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/	5	LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
6	-OPT=-O2	6	-OPT=-O2
7	+OPT=${CFLAGS}	7	+OPT=${CFLAGS}
8	OPT_DEBUG=-ggdb -Wall -lefence	8	OPT_DEBUG=-ggdb -Wall -lefence
9	-DIR=/usr/local/bin	9	DIR=/bin
10	+DIR=${PREFIX}/bin
11	SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc	10	SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
12	MANPAGE=amap.1
13	all: pcre strip

Lines 1-11 Link Here

(-)amap/files/patch-configure (-4 / +25 lines)
1	--- configure.orig Tue Jul 29 14:10:16 2003	1	--- configure.orig Sun Sep 14 11:10:24 2003
2	+++ configure Tue Jul 29 14:15:56 2003	2	+++ configure Sun Sep 14 11:16:41 2003
3	@@ -135,7 +135,7 @@	3	@@ -33,7 +33,9 @@
		4	echo
		5
		6	echo "Checking for openssl ..."
		7	-for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \
		8	+# FreeBSD: Try port version of openssl first. LIBDIRS is irrelevant for us
		9	+# Since we don't have /etc/ld.so.conf
		10	+for i in ${PREFIX}/lib $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \
		11	/ssl /usr/ssl /opt/ssl /usr/local/ssl /opt/local/*ssl \
		12	/ssl/lib /usr/ssl/lib /opt/ssl/lib /usr/local/ssl/lib /opt/local/*ssl/lib
		13	do
		14	@@ -61,7 +63,8 @@
		15	fi
		16	done
		17
		18	-for i in /usr/local/include /*ssl/include /usr/include \
		19	+# FreeBSD: Change to prefer installed port over base-system openssl.
		20	+for i in ${PREFIX}/include /usr/local/include /*ssl/include /usr/include \
		21	/opt/ssl/include /usr/ssl/include /usr/local/*ssl/include
		22	do
		23	if [ "X" = "X$SSL_IPATH" ]; then
		24	@@ -152,7 +155,7 @@
4	XLIBS="$XLIBS -lresolv"	25	XLIBS="$XLIBS -lresolv"
5	fi	26	fi
6		27
7	-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do	28	-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
8	+for i in ${MANPPREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do	29	+for i in ${PREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
9	if [ -d $i ]; then	30	if [ -d $i ]; then
10	MANDIR=$i	31	MANDIR=$i
11	fi	32	fi