From 39a855294d783cdc4f22cd800742e528ca77a33b Mon Sep 17 00:00:00 2001 From: Jacques Vidrine Date: Tue, 21 Sep 1999 22:37:13 +0000 Subject: [PATCH] Update 2.1b2 -> 2.1b3 and unbreak. Point MAINTAINER to Karl Dietz . PR: ports/12999, ports/13654 Submitted by: Karl Dietz --- www/web500gw/Makefile | 16 +++---- www/web500gw/distinfo | 2 +- www/web500gw/files/patch-aa | 83 ++++++++++++++++++++++++------------- www/web500gw/pkg-plist | 2 + 4 files changed, 65 insertions(+), 38 deletions(-) diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile index 56c4498e83d8..26a671123c38 100644 --- a/www/web500gw/Makefile +++ b/www/web500gw/Makefile @@ -6,21 +6,21 @@ # $FreeBSD$ # -DISTNAME= web500gw-2.1b2 +DISTNAME= web500gw-2.1b3 CATEGORIES= www net MASTER_SITES= ftp://ftp.tu-chemnitz.de/pub/Local/urz/web500gw/ \ - http://www.tu-chemnitz.de/ftp-home/pub/Local/urz/web500gw/ -EXTRACT_SUFX= .tgz + http://www.tu-chemnitz.de/ftp-home/pub/Local/urz/web500gw/ \ + ftp://ftp.ntua.gr/pub/net/ldap/web500gw/ \ + ftp://ftp.imms.de/pub/unix/networking/ldap/ -MAINTAINER= bjn@visi.com +MAINTAINER= karl.dietz@triplan.com -BROKEN= build - -BUILD_DEPENDS= ${PREFIX}/lib/libldap.a:${PORTSDIR}/net/ldap +BUILD_DEPENDS= ${PREFIX}/lib/libldap.a:${PORTSDIR}/net/openldap INSTDIR= ${PREFIX}/bin -MAKE_ENV= PLATFORMCFLAGS="${CFLAGS} -DUSE_SYSCONF" \ +MAKE_ENV= PLATFORMCFLAGS="${CFLAGS} -DUSE_SYSCONF -I${PREFIX}/include" \ + LDFLAGS=-L${PREFIX}/lib \ INSTDIR=${INSTDIR} \ WEB500GWDIR=${WEB500GWDIR} \ MANDIR=${MANPREFIX}/man/man8 \ diff --git a/www/web500gw/distinfo b/www/web500gw/distinfo index 4e6c0c226bf9..19faa27f1b91 100644 --- a/www/web500gw/distinfo +++ b/www/web500gw/distinfo @@ -1 +1 @@ -MD5 (web500gw-2.1b2.tgz) = 813eeac9eeaeb44b81a278dc407c877f +MD5 (web500gw-2.1b3.tar.gz) = 8e411a94f79bad75a3e8deeea3d05050 diff --git a/www/web500gw/files/patch-aa b/www/web500gw/files/patch-aa index 1368a8bad65e..f13754781687 100644 --- a/www/web500gw/files/patch-aa +++ b/www/web500gw/files/patch-aa @@ -1,35 +1,29 @@ ---- Makefile.orig Fri Mar 13 08:12:44 1998 -+++ Makefile Tue Aug 18 12:18:18 1998 -@@ -3,14 +3,14 @@ +--- Makefile.orig Wed Aug 4 13:44:08 1999 ++++ Makefile Wed Aug 4 14:40:54 1999 +@@ -3,18 +3,19 @@ #----------------------------------------------------------------------------- # Where to install web500gw -INSTDIR = /usr/local/etc -+#INSTDIR = /usr/local/bin ++#INSTDIR = /usr/local/etc # Where to install the manual web500gw.8 -MANDIR = /usr/local/man/man8 +#MANDIR = /usr/local/man/man8 - # ... and web500gw' config/help/message files + # 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 = /usr/local/etc/web500gw ++#WEB500GWDIR = $(INSTDIR)/web500 # What language dependent files should be installed? # "" stands for english (default) versions -@@ -34,8 +34,9 @@ - ## If you use U-Mich LDAP 3.3 package (recommended) - # If the LDAP include files and libraries installed in standard places - # (/usr/lib, /usr/include) use this: --LDAPINCL = --LDAPLIBS = -lldap -llber -+LDAPDIR = /usr/local -+LDAPINCL = -I$(LDAPDIR)/include -+LDAPLIBS = -L$(LDAPDIR)/lib -lldap -llber - # set LDAPVERSION (32 for ldap-3.2, 33 for 3.3 etc) - LDAPVERSION = 33 - VERSION = 3.3 +-SUFFIX = "" de es fr ++SUFFIX = "" de ++# es fr + + + # DEFINES - Enable/disable some features @@ -51,7 +52,7 @@ # T.61 <-> ISO-8859-1 translation: This is built in from LDAP 3.2. @@ -44,31 +38,56 @@ # platform specific: # Linux -PLATFORMCFLAGS= -Dlinux -DSYSV -+#PLATFORMCFLAGS= -Dlinux -DSYSV ++# PLATFORMCFLAGS= -Dlinux -DSYSV # Solaris 2 # PLATFORMCFLAGS= -Dsunos5 # PLATFORMLDFLAGS= -lsocket -lnsl -@@ -92,7 +93,7 @@ +@@ -82,8 +83,8 @@ + # AIX + # PLATFORMCFLAGS= -Daix + # NetBSD: +-#PLATFORMCFLAGS= +-#PLATFORMLDFLAGS= -lcompat ++# PLATFORMCFLAGS= ++# PLATFORMLDFLAGS= -lcompat + # OSF/1 + #PLATFORMCFLAGS= -Dosf -DSYSV + #PLATFORMLDFLAGS= +@@ -99,8 +100,8 @@ # when using gcc: CC = gcc - # WARN = -Wall -Wno-implicit --CFLAGS = -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings -+CFLAGS = $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings - #CFLAGS = -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings + #WARN = -Wall -Wno-implicit +-#CFLAGS = -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings +-CFLAGS = -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings ++CFLAGS = -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings ++#CFLAGS = -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings # or cc: -@@ -105,7 +106,7 @@ + #CC = cc +@@ -110,9 +111,9 @@ + + ################ end of configuration area ############### # ALDFLAGS are always passed to ld - ALDFLAGS = $(PLATFORMLDFLAGS) +-ALDFLAGS = $(PLATFORMLDFLAGS) ++ALDFLAGS = ${LDFLAGS} $(PLATFORMLDFLAGS) -INSTALL = util/install.sh +#INSTALL = util/install.sh MKDIR = mkdir # LIBEFENCE = -lefence -@@ -149,30 +150,30 @@ - $(INSTDIR)/web500gw: web500gw +@@ -138,7 +139,7 @@ + #web500gw.o: messages.h web500gw.h + + web500gw: Makefile $(OBJS) +- $(CC) $(ALDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(ALDFLAGS) -o $@ $(OBJS) $(LIBS) -lgnuregex + + #$(CC) $(ALDFLAGS) -o $@ $(OBJS) -R/usr/local/ic/usr/lib -L/usr/local/ic/usr/lib -lldap -llber -lisode + +@@ -160,34 +161,34 @@ @echo "" + @if [ ! -d $(INSTDIR) ]; then $(MKDIR) -p $(INSTDIR); fi @echo "Installing web500gw to $(INSTDIR)" - $(INSTALL) $(INSTALLFLAGS) -m 755 web500gw $(INSTDIR) + $(INSTALL_PROGRAM) web500gw $(INSTDIR) @@ -77,13 +96,19 @@ install-etc:; @echo "" @if [ ! -d $(WEB500GWDIR) ]; then $(MKDIR) -p $(WEB500GWDIR); fi - @echo "Installing web500gw config/help/message files to $(WEB500GWDIR)" + @echo "Installing web500gw config/template/filter files to $(WEB500GWDIR)" - $(INSTALL) $(INSTALLFLAGS) -m 644 etc/web500gw.conf $(WEB500GWDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldapfilter.conf $(WEB500GWDIR) +- $(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldapfilter.conf.internal $(WEB500GWDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldaptemplates.conf $(WEB500GWDIR) +- $(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldaptemplates.conf.internal $(WEB500GWDIR) + $(INSTALL_DATA) etc/web500gw.conf $(WEB500GWDIR)/sample.web500gw.conf + $(INSTALL_DATA) etc/ldapfilter.conf $(WEB500GWDIR)/sample.ldapfilter.conf ++ $(INSTALL_DATA) etc/ldapfilter.conf.internal $(WEB500GWDIR)/sample.ldapfilter.conf.internal + $(INSTALL_DATA) etc/ldaptemplates.conf $(WEB500GWDIR)/sample.ldaptemplates.conf ++ $(INSTALL_DATA) etc/ldaptemplates.conf.internal $(WEB500GWDIR)/sample.ldaptemplates.conf.internal + @echo "" + @echo "Installing web500gw help/message/friendly files to $(WEB500GWDIR)" @for i in $(SUFFIX); do \ if [ "x$$i" = "x" ]; then echo " english"; SUFF="";\ else echo " $$i"; SUFF=".$$i"; fi; \ diff --git a/www/web500gw/pkg-plist b/www/web500gw/pkg-plist index c747f28bc113..a0a2ddcd1c38 100644 --- a/www/web500gw/pkg-plist +++ b/www/web500gw/pkg-plist @@ -2,7 +2,9 @@ bin/web500gw etc/web500gw/ldapfriendly etc/web500gw/ldapfriendly.de etc/web500gw/sample.ldapfilter.conf +etc/web500gw/sample.ldapfilter.conf.internal etc/web500gw/sample.ldaptemplates.conf +etc/web500gw/sample.ldaptemplates.conf.internal etc/web500gw/sample.web500gw.conf etc/web500gw/web500gw.attr etc/web500gw/web500gw.attr.de