The directory to pick up the openldap1 package from is

../../databases/openldap1 now.

It doesn't make much sense to me to patch a Makefile to include
@PREFIX@ patterns, followed by a custom script to substitute @PREFIX@
for ${PREFIX}.  Modify the patch to use "${PREFIX}" (which is passed
through the environment anyway), and is what every other package
seems to use quite happily.

Remove now unnecessary script file.

4 files changed, 10 insertions, 15 deletions

diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile
index 45656fd453c..11778a5cca0 100644
--- a/www/web500gw/Makefile
+++ b/www/web500gw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:22:45 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/26 12:18:20 agc Exp $
 
 DISTNAME=	web500gw-2.1b3
 CATEGORIES=	www databases
@@ -8,6 +8,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.tu-chemnitz.de/~fri/web500gw/
 COMMENT=	WWW to ldap gateway
 
-DEPENDS+=	openldap-1.2.*:../../databases/openldap
+DEPENDS+=	openldap-1.2.*:../../databases/openldap1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/web500gw/distinfo b/www/web500gw/distinfo
index c62a65623cc..eddd7b980a7 100644
--- a/www/web500gw/distinfo
+++ b/www/web500gw/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:47 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/10/26 12:18:20 agc Exp $
 
 SHA1 (web500gw-2.1b3.tar.gz) = 417533e1bdecac8437119d49622c8e030937c6c0
 Size (web500gw-2.1b3.tar.gz) = 143463 bytes
-SHA1 (patch-aa) = 99c1975f54efdd4b9236d1a6e2b34878ba76c363
+SHA1 (patch-aa) = a6feaf33012a92cbf6839858922e5ac2fcf6c501
 SHA1 (patch-ab) = 51ed9b0d944c37b8a12ef0c8744f7a49ec001999
diff --git a/www/web500gw/patches/patch-aa b/www/web500gw/patches/patch-aa
index f39f589a18a..77272a2b650 100644
--- a/www/web500gw/patches/patch-aa
+++ b/www/web500gw/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/06/19 07:56:20 kleink Exp $
+$NetBSD: patch-aa,v 1.3 2001/10/26 12:18:21 agc Exp $
 
 --- Makefile.orig	Wed Oct 28 15:21:57 1998
 +++ Makefile	Fri Jan  8 14:05:39 1999
@@ -7,16 +7,16 @@ $NetBSD: patch-aa,v 1.2 2000/06/19 07:56:20 kleink Exp $
  
  # Where to install web500gw
 -INSTDIR = /usr/local/etc
-+INSTDIR = @PREFIX@/sbin
++INSTDIR = ${PREFIX}/sbin
  
  # Where to install the manual web500gw.8
 -MANDIR	= /usr/local/man/man8
-+MANDIR	= @PREFIX@/man/man8
++MANDIR	= ${PREFIX}/man/man8
  
  # Where to install web500gw's config/filter/template/help/message files
  # It's recommended to use an own directory for it.
 -WEB500GWDIR	= $(INSTDIR)/web500
-+WEB500GWDIR	= @PREFIX@/etc/web500
++WEB500GWDIR	= ${PREFIX}/etc/web500
  
  # What language dependent files should be installed? 
  # "" stands for english (default) versions
@@ -35,8 +35,8 @@ $NetBSD: patch-aa,v 1.2 2000/06/19 07:56:20 kleink Exp $
  # (/usr/lib, /usr/include) use this:
 -LDAPINCL = 
 -LDAPLIBS = -lldap -llber
-+LDAPINCL = -I@PREFIX@/include
-+LDAPLIBS = -L@PREFIX@/lib -Wl,-R@PREFIX@/lib -lldap -llber -lcompat
++LDAPINCL = -I${PREFIX}/include
++LDAPLIBS = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lldap -llber -lcompat
  # set LDAPVERSION (32 for ldap-3.2, 33 for 3.3 etc)
  LDAPVERSION = 33
  VERSION = 3.3
diff --git a/www/web500gw/scripts/post-patch b/www/web500gw/scripts/post-patch
deleted file mode 100755
index bd05ce38905..00000000000
--- a/www/web500gw/scripts/post-patch
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# $NetBSD: post-patch,v 1.1.1.1 1999/01/08 14:15:57 hwr Exp $
-cd ${WRKSRC}
-mv -f Makefile Makefile.pre
-sed -e "s|@PREFIX@|${PREFIX}|g" < Makefile.pre > Makefile