5 files changed, 61 insertions, 17 deletions
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 5b1efa8a075..29f4d806550 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/11 19:21:36 joerg Exp $
 #
 
 DISTNAME=       amap-5.0
+PKGREVISION=	1
 CATEGORIES=     net security
 MASTER_SITES=   http://www.thc.org/releases/
 
@@ -34,8 +35,6 @@ SUBST_MESSAGE.conf=	"Fixing configure script."
 
 INSTALLATION_DIRS=	bni man/man1
 
-.include "../../security/openssl/buildlink3.mk"
-
 post-extract:
 	@${CHMOD} 0700 ${WRKSRC}
 
@@ -49,4 +48,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/appdefs.resp ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/appdefs.rpc ${EGDIR}
 
+
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/amap/distinfo b/security/amap/distinfo
index 5e98a6a16d7..c2bb7106acb 100644
--- a/security/amap/distinfo
+++ b/security/amap/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2005/12/11 19:21:36 joerg Exp $
 
 SHA1 (amap-5.0.tar.gz) = 156b8919427040f143649bf54bbf88a220be451c
 RMD160 (amap-5.0.tar.gz) = fe80513c59d6f0f19dbb0cf778d97edc3dcf9d71
 Size (amap-5.0.tar.gz) = 261784 bytes
-SHA1 (patch-aa) = d41ff8d37c6ed5ac5a6a1c39dcea51e8cf9441e1
-SHA1 (patch-ab) = 254e406b5194fc6be00f7286e5152749f9506c4e
+SHA1 (patch-aa) = f0ac804f53307fd496b437c15fb1e9c902e2b6d5
+SHA1 (patch-ab) = 1f6c4e78db3db3838f1d0614fb6964b90261df6f
 SHA1 (patch-ac) = e331995893a865228383f5631f096e001bf64274
+SHA1 (patch-ad) = 907c0d5e06b04d9ccbed8dde172ad8dc9183970d
diff --git a/security/amap/patches/patch-aa b/security/amap/patches/patch-aa
index e5cfd164b41..5fb5a5c6a0a 100644
--- a/security/amap/patches/patch-aa
+++ b/security/amap/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/11 19:21:36 joerg Exp $
 
 --- configure.orig	2005-02-16 15:53:57.000000000 +0000
 +++ configure
-@@ -35,7 +35,8 @@ echo
+@@ -13,10 +13,6 @@ if [ "$1" = "--help" ]; then
+   exit 0
+ fi
+ 
+-cd pcre-3.9 || exit 1
+-./configure || exit 1
+-cd ..
+-
+ echo
+ echo
+ echo "Starting amap auto configuration ..."
+@@ -35,7 +31,8 @@ echo
  echo "Checking for openssl ..."
  for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
  /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
@@ -12,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
  do
      if [ "X" = "X$SSL_PATH" ]; then
          if [ -f "$i/libssl.so" -o -f "$i/libssl.dylib" ]; then
-@@ -62,7 +63,7 @@ do
+@@ -62,7 +59,7 @@ do
  done
  
  for i in /usr/local/include /*ssl/include /usr/include \
@@ -21,7 +32,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
  do
      if [ "X" = "X$SSL_IPATH" ]; then
          if [ -f "$i/openssl/ssl.h" ]; then
-@@ -89,7 +90,7 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th
+@@ -89,7 +86,7 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th
      SSL_IPATH=""
  fi
  
@@ -30,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
  if [ "$SYS" = "SunOS" ]; then
      echo "Checking for Solaris libraries ..."
      for i in  /lib /usr/lib /usr/local/lib $LIBDIRS
-@@ -152,7 +153,7 @@ if [ -n "$RESOLV_PATH" ]; then
+@@ -152,7 +149,7 @@ if [ -n "$RESOLV_PATH" ]; then
      XLIBS="$XLIBS -lresolv"
  fi
  
@@ -39,7 +50,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
    if [ -d $i ]; then
      MANDIR=$i
    fi
-@@ -168,9 +169,9 @@ if [ -d /usr/kerberos/include ]; then
+@@ -168,9 +165,9 @@ if [ -d /usr/kerberos/include ]; then
  fi
  
  if [ -n "$PREFIX" ]; then
@@ -51,7 +62,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
  fi
  echo "Amap will be installed into .../bin and .../etc of: $PREFIX"
  echo "  (change this by running ./configure --prefix=path)"
-@@ -178,7 +179,7 @@ echo
+@@ -178,7 +175,7 @@ echo
  
  echo "Writing Makefile.in ..."
  echo "XDEFINES=$XDEFINES" >> Makefile.in
diff --git a/security/amap/patches/patch-ab b/security/amap/patches/patch-ab
index 2683261c14f..17bcbac5db2 100644
--- a/security/amap/patches/patch-ab
+++ b/security/amap/patches/patch-ab
@@ -1,16 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/04/24 12:10:48 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/11 19:21:36 joerg Exp $
 
 --- Makefile.am.orig	2005-02-18 18:01:26.000000000 +0000
 +++ Makefile.am
-@@ -1,7 +1,8 @@
+@@ -1,16 +1,14 @@
 -CC=gcc
-+#CC=gcc
- LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
+-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
 -OPT=-O2
 -OPT_DEBUG=-ggdb -Wall -lefence
++#CC=gcc
++LIB=-lpcre
 +SHAREDIR=${PREFIX}/share/amap
 +OPT=${CFLAGS} -DSHAREDIR="\"$(SHAREDIR)/\""
 +#OPT_DEBUG=-ggdb -Wall -lefence
  BINDIR=/bin
  DATADIR=/etc
  MANDIR=/man/man1
+ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
+ MANPAGE=amap.1
+-all:	pcre strip
+-
+-pcre:
+-	cd pcre-3.9 && make
++all:	strip
+ 
+ amap-lib.o:	amap-lib.c
+ 	$(CC) $(OPT) -c -o amap-lib.o amap-lib.c $(XIPATHS) $(XDEFINES)
+@@ -43,5 +41,4 @@ install:	all
+ 	-cp -f $(MANPAGE) $(PREFIX)$(MANDIR)
+ 
+ clean:	
+-	cd pcre-3.9 && make clean
+ 	rm -f amap amapcrap amap.exe amapcrap.exe amap6 amap-lib.o Makefile.in core *~ Makefile
diff --git a/security/amap/patches/patch-ad b/security/amap/patches/patch-ad
new file mode 100644
index 00000000000..9698e3bda4c
--- /dev/null
+++ b/security/amap/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/12/11 19:21:36 joerg Exp $
+
+--- amap-inc.h.orig	2005-12-08 18:57:48.000000000 +0000
++++ amap-inc.h
+@@ -20,7 +20,7 @@
+ #include <errno.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+-#include "pcre-3.9/pcre.h"
++#include <pcre.h>
+ #ifdef OPENSSL
+  #include <openssl/ssl.h>
+  #include <openssl/err.h>