diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-08-21 14:56:55 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-08-21 14:56:55 +0000 |
commit | f7388c6313102d0285104f811501d32414175a57 (patch) | |
tree | 53f5925831ff7117e0e2825831ae1dadaeac2a6a /net/samba3 | |
parent | Update to 3.06. (diff) |
Update to alpha19
Notes
Notes:
svn path=/head/; revision=64754
Diffstat (limited to 'net/samba3')
-rw-r--r-- | net/samba3/Makefile | 4 | ||||
-rw-r--r-- | net/samba3/distinfo | 2 | ||||
-rw-r--r-- | net/samba3/files/patch-aa | 29 | ||||
-rw-r--r-- | net/samba3/files/patch-includes.h | 11 | ||||
-rw-r--r-- | net/samba3/files/patch-installman.sh | 8 |
5 files changed, 7 insertions, 47 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 5ae2f02ca6b9..07d2bc50a555 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= samba -PORTVERSION= 3.0a18 +PORTVERSION= 3.0a19 CATEGORIES= net MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/ MASTER_SITE_SUBDIR= alpha old @@ -43,7 +43,7 @@ CONFIGURE_ARGS= --libdir=${SAMBA_CONFDIR} \ --with-sambabook=${PREFIX}/share/swat/using_samba \ --with-lockdir=${VARDIR}/lock --with-privatedir=${SAMBA_PRIVATE} \ --exec-prefix=${PREFIX} --with-pam --without-manpages-langs \ - --with-piddir=${VARDIR}/run + --with-piddir=${VARDIR}/run --with-logfilebase=${VARDIR}/log .include <bsd.port.pre.mk> diff --git a/net/samba3/distinfo b/net/samba3/distinfo index 978b75a53a2b..b69a4fd5ffe5 100644 --- a/net/samba3/distinfo +++ b/net/samba3/distinfo @@ -1 +1 @@ -MD5 (samba-3.0-alpha18.tar.gz) = 64adf29c7a05b46b7092a9630eb4a66b +MD5 (samba-3.0-alpha19.tar.gz) = 497ff8a99f8afe7528ced8dd5f29f46c diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa deleted file mode 100644 index 8f0187cfcf2a..000000000000 --- a/net/samba3/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig Fri Aug 9 08:34:27 2002 -+++ Makefile.in Fri Aug 9 08:36:52 2002 -@@ -52,7 +52,7 @@ - # set these to where to find various files - # These can be overridden by command line switches (see smbd(8)) - # or in smb.conf (see smb.conf(5)) --LOGFILEBASE = $(VARDIR) -+LOGFILEBASE = $(VARDIR)/log - CONFIGFILE = $(LIBDIR)/smb.conf - LMHOSTSFILE = $(LIBDIR)/lmhosts - DRIVERFILE = $(LIBDIR)/printers.def -@@ -557,7 +557,7 @@ - @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ - dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi - @echo Compiling $*.c -- @$(CC) -I. -I$(srcdir) $(FLAGS) -c $< \ -+ @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) -c $< \ - -o $@ - @BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@ - -@@ -583,7 +583,7 @@ - @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ - dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi - @echo Compiling $*.c with @PICFLAG@ -- @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@ -+ @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@ - @BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@ - @POBAD_CC@ @mv $*.po.o $@ - diff --git a/net/samba3/files/patch-includes.h b/net/samba3/files/patch-includes.h index 25653af85e5b..d041b5d22e49 100644 --- a/net/samba3/files/patch-includes.h +++ b/net/samba3/files/patch-includes.h @@ -12,14 +12,3 @@ #ifdef AIX #define DEFAULT_PRINTING PRINT_AIX #define PRINTCAP_NAME "/etc/qconfig" -@@ -1119,6 +1124,10 @@ - for snprintf and vsnprintf */ - #define slprintf snprintf - #define vslprintf vsnprintf -+ -+#ifndef PAM_AUTHTOK_RECOVER_ERR -+#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR -+#endif - - #endif /* _INCLUDES_H */ - diff --git a/net/samba3/files/patch-installman.sh b/net/samba3/files/patch-installman.sh index 1f36ba28c922..5ec4061a559e 100644 --- a/net/samba3/files/patch-installman.sh +++ b/net/samba3/files/patch-installman.sh @@ -1,11 +1,11 @@ ---- script/installman.sh.orig Fri Jan 18 21:59:14 2002 -+++ script/installman.sh Fri Jan 18 21:59:40 2002 +--- script/installman.sh.orig Wed Aug 21 09:33:36 2002 ++++ script/installman.sh Wed Aug 21 09:33:53 2002 @@ -22,7 +22,7 @@ echo Installing \"$lang\" man pages in $MANDIR/lang/$lang fi -- langdir=$MANDIR/lang/$lang +- langdir=$MANDIR/$lang + langdir=$MANDIR - for d in $MANDIR $MANDIR/lang $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do + for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do if [ ! -d $d ]; then mkdir $d |