Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Jun 2003 20:55:15 +0000 (GMT)
From:      Yonatan@xpert.com
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/53902: security/amap update to 2.7
Message-ID:  <20030629205515.5AC37A7B@110.xpert.com>
Resent-Message-ID: <200306291800.h5TI0X6f099003@freefall.freebsd.org>

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

>Number:         53902
>Category:       ports
>Synopsis:       security/amap update to 2.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 29 11:00:30 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Yonatan@xpert.com
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD Temujin 4.8-RC FreeBSD 4.8-RC #1: Sat Apr 12 03:02:22 GMT 2003 root@Temujin:/usr/obj/usr/src/sys/TEMUJIN-G i386

>Description:
	Update to 2.7. New binary, new config file, new Makefile logic to handle docs.
>How-To-Repeat:
	N/A
>Fix:

--- amap-2.7.shar begins here ---
diff -urN amap.orig/Makefile amap/Makefile
--- amap.orig/Makefile	Wed Apr 16 01:08:14 2003
+++ amap/Makefile	Sun Jun 29 20:45:59 2003
@@ -2,21 +2,19 @@
 # Date created:			  23 Mar  2003
 # Whom:				  Yonatan <Yonatan@xpert.com>
 #
-# $FreeBSD: ports/security/amap/Makefile,v 1.2 2003/04/16 01:08:14 leeym Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	amap
-PORTVERSION=	1.2.1
+PORTVERSION=	2.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	Yonatan@xpert.com
 COMMENT=	Application mapper
 
 HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
-ALL_TARGET=	all
 MAN1=		amap.1
 
 post-patch:
@@ -24,9 +22,17 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin/
 	${MKDIR} ${PREFIX}/share/amap
 	${INSTALL_DATA} ${WRKSRC}/appdefs.resp ${PREFIX}/share/amap/
+	${INSTALL_DATA} ${WRKSRC}/appdefs.rpc ${PREFIX}/share/amap/
 	${INSTALL_DATA} ${WRKSRC}/appdefs.trig ${PREFIX}/share/amap/
 	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1/
+.	if !defined(NOPORTDOCS)
+		${MKDIR} ${DOCSDIR}
+.		for i in README BUGS TODO CHANGES LICENSE
+			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+.		endfor
+.	endif
 
 .include <bsd.port.mk>
diff -urN amap.orig/distinfo amap/distinfo
--- amap.orig/distinfo	Wed Apr  2 10:22:39 2003
+++ amap/distinfo	Sun Jun 29 20:09:45 2003
@@ -1 +1 @@
-MD5 (amap-1.2.1.tgz) = c84cdd211628573fc516575829629896
+MD5 (amap-2.7.tar.gz) = 742448f85d6abf0897a7d0a703b66328
diff -urN amap.orig/files/patch-Makefile.am amap/files/patch-Makefile.am
--- amap.orig/files/patch-Makefile.am	Wed Apr  2 10:22:39 2003
+++ amap/files/patch-Makefile.am	Sun Jun 29 20:40:47 2003
@@ -1,16 +1,15 @@
---- Makefile.am.orig	Sun Mar 23 14:32:41 2003
-+++ Makefile.am	Sun Mar 23 14:40:52 2003
-@@ -1,10 +1,9 @@
--CC=gcc
+--- Makefile.am.orig	Tue Jun 10 17:02:49 2003
++++ Makefile.am	Tue Jun 10 17:03:35 2003
+@@ -1,9 +1,9 @@
+ CC=gcc
 -OPT=-O2
-+OPT=-O
++OPT=${CFLAGS}
  OPT_DEBUG=-ggdb -Wall
- BIN=amap
 -DIR=/usr/local/bin
 +DIR=${PREFIX}/bin
- SCRIPTS=appdefs.trig appdefs.resp
+ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
 -MANDIR=/usr/local/man/man1
-+MANDIR=${MANPREFIX}
++MANDIR=${MANPREFIX}/man/man1
  MANPAGE=amap.1
  all:	strip
  
diff -urN amap.orig/files/patch-amap-inc.h amap/files/patch-amap-inc.h
--- amap.orig/files/patch-amap-inc.h	Thu Jan  1 00:00:00 1970
+++ amap/files/patch-amap-inc.h	Sun Jun 29 20:32:33 2003
@@ -0,0 +1,14 @@
+--- amap-inc.h.orig	Sun Jun 29 20:31:38 2003
++++ amap-inc.h	Sun Jun 29 20:31:50 2003
+@@ -12,10 +12,9 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <arpa/inet.h>
+-#include <netdb.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <netdb.h>
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
diff -urN amap.orig/files/patch-amap.c amap/files/patch-amap.c
--- amap.orig/files/patch-amap.c	Wed Apr  2 10:22:39 2003
+++ amap/files/patch-amap.c	Thu Jan  1 00:00:00 1970
@@ -1,12 +0,0 @@
---- amap.c.orig	Sun Mar 23 15:42:07 2003
-+++ amap.c	Sun Mar 23 16:01:36 2003
-@@ -64,7 +64,8 @@
- char banner_string[256];
- 
- // where are my appdefs files?
--char *searchpath[12] = { "./", "/etc/", "/usr/etc", "/usr/local/etc/", 
-+char *searchpath[13] = { "./", "PREFIX/share/amap/", "/etc/", "/usr/etc",
-+                           "/usr/local/etc/", 
-                            "/opt/etc/", "/usr/local/amap/", "/opt/amap/",
-                            "/usr/local/lib/", "/usr/local/lib/amap/",
-                            "/usr/lib/amap/", "/usr/local/bin/", NULL };
diff -urN amap.orig/files/patch-amap.h amap/files/patch-amap.h
--- amap.orig/files/patch-amap.h	Thu Jan  1 00:00:00 1970
+++ amap/files/patch-amap.h	Sun Jun 29 20:28:13 2003
@@ -0,0 +1,12 @@
+--- amap.h.orig	Tue Jun 10 17:05:40 2003
++++ amap.h	Tue Jun 10 17:06:25 2003
+@@ -57,7 +57,8 @@
+ //-----------------------------------------
+ 
+ // where are my appdefs files? all entries must end with a slash!
+-char *searchpath[14] = { "./", "/etc/", "/usr/etc/", "/usr/local/etc/",
++char *searchpath[15] = { "./", "PREFIX/share/amap/", "/etc/", "/usr/etc/",
++  "/usr/local/etc/",
+   "/opt/etc/", "/usr/local/amap/", "/opt/amap/",
+   "/usr/local/lib/", "/usr/local/lib/amap/",
+   "/usr/lib/amap/", "/usr/local/bin/",
diff -urN amap.orig/files/patch-amapcrap.c amap/files/patch-amapcrap.c
--- amap.orig/files/patch-amapcrap.c	Thu Jan  1 00:00:00 1970
+++ amap/files/patch-amapcrap.c	Sun Jun 29 20:26:32 2003
@@ -0,0 +1,13 @@
+--- amapcrap.c.orig	Sun Jun 29 20:26:03 2003
++++ amapcrap.c	Sun Jun 29 20:26:13 2003
+@@ -15,9 +15,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <netdb.h>
+-#include <netinet/in.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
diff -urN amap.orig/pkg-plist amap/pkg-plist
--- amap.orig/pkg-plist	Wed Apr  2 10:22:39 2003
+++ amap/pkg-plist	Sun Jun 29 20:53:01 2003
@@ -1,5 +1,13 @@
-@comment $FreeBSD: ports/security/amap/pkg-plist,v 1.1 2003/04/02 10:22:39 edwin Exp $
+@comment $FreeBSD$
 bin/amap
+bin/amapcrap
 share/amap/appdefs.resp
+share/amap/appdefs.rpc
 share/amap/appdefs.trig
+%%PORTDOCS%%share/doc/amap/README
+%%PORTDOCS%%share/doc/amap/BUGS
+%%PORTDOCS%%share/doc/amap/TODO
+%%PORTDOCS%%share/doc/amap/CHANGES
+%%PORTDOCS%%share/doc/amap/LICENSE
+%%PORTDOCS%%@dirrm share/doc/amap
 @dirrm share/amap
--- amap-2.7.shar ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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