diff options
author | jlam <jlam@pkgsrc.org> | 2003-06-04 06:12:21 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2003-06-04 06:12:21 +0000 |
commit | 13a527e481b2737e53e0e8a5de008715c93b9240 (patch) | |
tree | 1a434d91f9a8b5d9b10dfe993907c506062f3b8a /net/samba | |
parent | 75a6360ed6c6f71622044a371d1740ffc07793f5 (diff) | |
download | pkgsrc-13a527e481b2737e53e0e8a5de008715c93b9240.tar.gz |
Bump the PKGREVISION for net/samba to 2:
* findsmb is a perl script, and we need to substitute the correct path to
the perl interpreter.
* Don't create ${PREFIX}/private during a "make install" as it's a
completely useless directory.
* Don't bother to install the completely outdated Samba HTML documentation
that is superseded by the Samba HOWTO Collection documentation.
Diffstat (limited to 'net/samba')
-rw-r--r-- | net/samba/Makefile | 14 | ||||
-rw-r--r-- | net/samba/PLIST | 19 | ||||
-rw-r--r-- | net/samba/distinfo | 4 | ||||
-rw-r--r-- | net/samba/patches/patch-ag | 13 |
4 files changed, 21 insertions, 29 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 7052e304073..14e9f95c61e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.98 2003/06/02 01:17:45 jschauma Exp $ +# $NetBSD: Makefile,v 1.99 2003/06/04 06:12:21 jlam Exp $ .include "Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://www.samba.org/ @@ -17,6 +17,8 @@ CONFIGURE_ARGS+= --with-ssl CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h +REPLACE_PERL+= script/findsmb.in + .if defined(USE_CUPS) && (${USE_CUPS} == "YES") .include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS @@ -49,7 +51,6 @@ MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -HTMLDIR= ${PREFIX}/share/doc/html/${PKGBASE} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf @@ -73,11 +74,10 @@ post-extract: post-install: # Install Samba documentation. ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA_DIR} ${HTMLDIR} cd ${WRKDIR}/${DISTNAME}/docs; \ - ${INSTALL_DATA} announce textdocs/* ${DOCDIR}; \ - ${INSTALL_DATA} Registry/*.reg ${DOCDIR}; \ - ${INSTALL_DATA} faq/*.html ${HTMLDIR} + for file in announce textdocs/* Registry/*.reg; do \ + ${INSTALL_DATA} $$file ${DOCDIR}; \ + done # Install Samba examples. ${INSTALL_DATA_DIR} ${EXAMPLESDIR} diff --git a/net/samba/PLIST b/net/samba/PLIST index d03674ec9d6..3a4a61e5032 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2002/10/18 11:50:27 martti Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/06/04 06:12:21 jlam Exp $ bin/findsmb bin/make_printerdef bin/make_smbcodepage @@ -51,22 +51,6 @@ sbin/mksmbpasswd sbin/nmbd sbin/smbd sbin/swat -share/doc/html/samba/Samba-Server-FAQ-1.html -share/doc/html/samba/Samba-Server-FAQ-2.html -share/doc/html/samba/Samba-Server-FAQ.html -share/doc/html/samba/Samba-meta-FAQ-1.html -share/doc/html/samba/Samba-meta-FAQ-2.html -share/doc/html/samba/Samba-meta-FAQ-3.html -share/doc/html/samba/Samba-meta-FAQ-4.html -share/doc/html/samba/Samba-meta-FAQ-5.html -share/doc/html/samba/Samba-meta-FAQ-6.html -share/doc/html/samba/Samba-meta-FAQ.html -share/doc/html/samba/sambafaq-1.html -share/doc/html/samba/sambafaq-2.html -share/doc/html/samba/sambafaq-3.html -share/doc/html/samba/sambafaq-4.html -share/doc/html/samba/sambafaq-5.html -share/doc/html/samba/sambafaq.html share/doc/samba/Application_Serving.txt share/doc/samba/BROWSING-Config.txt share/doc/samba/BROWSING.txt @@ -442,7 +426,6 @@ share/samba/swat/using_samba/index.html share/samba/swat/using_samba/inx.html share/samba/swat/using_samba/licenseinfo.html share/samba/swat/using_samba/this_edition.html -@dirrm share/doc/html/samba @dirrm share/doc/samba @dirrm share/examples/samba/LDAP/smbldap-tools/mkntpwd @dirrm share/examples/samba/LDAP/smbldap-tools/cgi diff --git a/net/samba/distinfo b/net/samba/distinfo index 4f0917c7a9f..a93b1113a1e 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2003/04/07 16:30:47 cjep Exp $ +$NetBSD: distinfo,v 1.29 2003/06/04 06:12:21 jlam Exp $ SHA1 (samba-2.2.8a.tar.bz2) = f25ff456bf7ac58d32eb0209c15ce0b2fa6d7450 Size (samba-2.2.8a.tar.bz2) = 4505672 bytes @@ -6,7 +6,7 @@ SHA1 (patch-aa) = 7f85ab121ffbcb67eb1f1c59f49245dda2eff44d SHA1 (patch-ab) = 8be47e3f277f191aff18f77d8ed5ef4d8903ec5f SHA1 (patch-ac) = cfde267ffe57046de18691f612e73ecdd1158d86 SHA1 (patch-ad) = 4b475533e36668e55b5c57a53133f216f9e72ea3 -SHA1 (patch-ag) = 256a7e1edb961985398a94c0b738fd96fe781f9c +SHA1 (patch-ag) = e296e076c6bfe20b839f6f6be83873d7cfcc9d89 SHA1 (patch-ah) = e87f2e393db68acc7028fe20d4772455379ad7aa SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb SHA1 (patch-al) = 9507677d964044416802e91597c29310c61c9622 diff --git a/net/samba/patches/patch-ag b/net/samba/patches/patch-ag index cc7b50b73a0..694decd58dc 100644 --- a/net/samba/patches/patch-ag +++ b/net/samba/patches/patch-ag @@ -1,7 +1,16 @@ -$NetBSD: patch-ag,v 1.1 2001/07/13 16:08:41 taca Exp $ +$NetBSD: patch-ag,v 1.2 2003/06/04 06:12:22 jlam Exp $ ---- script/installbin.sh.orig Sat Jan 13 04:28:02 2001 +--- script/installbin.sh.orig Fri Jan 12 11:28:02 2001 +++ script/installbin.sh +@@ -11,7 +11,7 @@ + shift + shift + +-for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do ++for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do + if [ ! -d $d ]; then + mkdir $d + if [ ! -d $d ]; then @@ -30,7 +30,9 @@ mv $BINDIR/$p2 $BINDIR/$p2.old fi |