From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 29 11:00:34 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A22D37B43C for ; Sun, 29 Jun 2003 11:00:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FF1C4402B for ; Sun, 29 Jun 2003 11:00:33 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5TI0XUp099005 for ; Sun, 29 Jun 2003 11:00:33 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5TI0X6f099003; Sun, 29 Jun 2003 11:00:33 -0700 (PDT) Resent-Date: Sun, 29 Jun 2003 11:00:33 -0700 (PDT) Resent-Message-Id: <200306291800.h5TI0X6f099003@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yonatan@xpert.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03A2C37B401 for ; Sun, 29 Jun 2003 10:52:37 -0700 (PDT) Received: from 110.xpert.com (110.xpert.com [199.203.132.110]) by mx1.FreeBSD.org (Postfix) with ESMTP id B409A44029 for ; Sun, 29 Jun 2003 10:52:35 -0700 (PDT) (envelope-from yonatan@xpert.com) Received: by 110.xpert.com (Postfix, from userid 1000) id 5AC37A7B; Sun, 29 Jun 2003 20:55:15 +0000 (GMT) Message-Id: <20030629205515.5AC37A7B@110.xpert.com> Date: Sun, 29 Jun 2003 20:55:15 +0000 (GMT) From: Yonatan@xpert.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53902: security/amap update to 2.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Yonatan@xpert.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jun 2003 18:00:34 -0000 >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 # -# $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 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 + #include + #include +-#include +-#include + #include + #include ++#include + #include + #include + #include 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 + #include + #include +-#include + #include + #include ++#include + #include + #include + #include 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: