diff options
| -rw-r--r-- | net/samba-devel/Makefile | 76 | ||||
| -rw-r--r-- | net/samba-libsmbclient/Makefile | 52 | ||||
| -rw-r--r-- | net/samba-libsmbclient/distinfo | 2 | ||||
| -rw-r--r-- | net/samba-libsmbclient/pkg-plist | 1 | ||||
| -rw-r--r-- | net/samba3/Makefile | 76 |
5 files changed, 119 insertions, 88 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index 4cd747650fa2..51072b300654 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -7,42 +7,19 @@ PORTNAME= samba PORTVERSION= 3.0.2.a -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= net +PORTREVISION?= 1 +PORTEPOCH?= 1 +CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= . rc DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/} -MAINTAINER= timur@gnu.org -COMMENT= A free SMB and CIFS client and server for UNIX +MAINTAINER?= timur@gnu.org +COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* - -OPTIONS= CUPS "With CUPS printing support" on \ - LDAP "With LDAP support" on \ - ADS "With Active Directory support" on \ - WINBIND "With WinBIND support" on \ - ACL_SUPPORT "With ACL support" off \ - SYSLOG "With Syslog support" off \ - QUOTAS "With Quota support" off \ - UTMP "With UTMP support" on \ - MSDFS "With MSDFS support" off \ - SAM_XML "With XML smbpasswd backend" off \ - SAM_MYSQL "With MYSQL smbpasswd backend" off \ - SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ - SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \ - PAM_SMBPASS "With SMB PAM module" off \ - PYTHON "With Python experimental bindings" off \ - LIBICONV "With installed ICONV library" off \ - POPT "With installed POPT library" on +CONFLICTS?= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* USE_BZIP2= yes -USE_RC_SUBR= yes -NO_LATEST_LINK= yes -INSTALLS_SHLIB= yes -USE_AUTOCONF_VER= 253 - # directories VARDIR= ${DESTDIR}/var SAMBA_SPOOL?= ${VARDIR}/spool/samba @@ -59,7 +36,8 @@ SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib -CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ + +CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ --libdir=${SAMBA_LIBDIR}/samba \ --localstatedir=${VARDIR} \ --with-configdir=${SAMBA_CONFDIR} \ @@ -68,11 +46,43 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \ --with-privatedir=${SAMBA_PRIVATE} \ --with-logfilebase=${SAMBA_LOGDIR} \ - --with-pam --with-readline --with-libsmbclient \ --with-manpages-langs=en +WRKSRC= ${WRKDIR}/${DISTNAME}/source + +# SUBPORTS end here +.if defined(SAMBA_SUBPORT) +.include <bsd.port.mk> +.else + +NO_LATEST_LINK= yes +INSTALLS_SHLIB= yes +USE_RC_SUBR= yes +USE_AUTOCONF_VER= 253 + +OPTIONS= CUPS "With CUPS printing support" on \ + LDAP "With LDAP support" on \ + ADS "With Active Directory support" on \ + WINBIND "With WinBIND support" on \ + ACL_SUPPORT "With ACL support" off \ + SYSLOG "With Syslog support" off \ + QUOTAS "With Quota support" off \ + UTMP "With UTMP support" on \ + MSDFS "With MSDFS support" off \ + SAM_XML "With XML smbpasswd backend" off \ + SAM_MYSQL "With MYSQL smbpasswd backend" off \ + SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ + SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \ + PAM_SMBPASS "With SMB PAM module" off \ + PYTHON "With Python experimental bindings" off \ + LIBICONV "With installed ICONV library" off \ + POPT "With installed POPT library" on + .include <bsd.port.pre.mk> +CONFIGURE_ARGS+= --with-pam --with-readline \ + --with-libsmbclient + .if defined(WITH_PYTHON) USE_PYTHON= 2.1+ # Hack to make it work with OPTIONS. Breaks portlint @@ -233,8 +243,6 @@ LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt CONFIGURE_ARGS+= --with-included-popt .endif -WRKSRC= ${WRKDIR}/${DISTNAME}/source - MLINKS= samba.7 Samba.7 MAN1= findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \ smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \ @@ -356,3 +364,5 @@ post-install: .endif .include <bsd.port.post.mk> + +.endif diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile index 7445aed94688..57a7d9911716 100644 --- a/net/samba-libsmbclient/Makefile +++ b/net/samba-libsmbclient/Makefile @@ -5,33 +5,45 @@ # $FreeBSD$ # -PORTNAME= samba -PORTVERSION= 3.0.2a -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SAMBA} -MASTER_SITE_SUBDIR= . old-versions -PKGNAMESUFFIX= -libsmbclient - -MAINTAINER= kwm@rainbow-runner.nl -COMMENT= The shared lib from the samba packages - -USE_BZIP2= yes -USE_SIZE= yes +PORTREVISION= 0 +PORTEPOCH= 0 +PKGNAMESUFFIX= -libsmbclient + +MAINTAINER= kwm@rainbow-runner.nl +COMMENT= The shared lib from the samba packages + +CONFLICTS= samba-3.* + +USE_ICONV= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/source - -CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib +SAMBA_PORT= samba-devel +SAMBA_SUBPORT= yes + +MASTERDIR= ${.CURDIR}/../${SAMBA_PORT} +PKGDIR= ${.CURDIR} +# We WANT libsmbclient support :) +CONFIGURE_ARGS+= --with-libsmbclient +CONFIGURE_ARGS+= --with-libiconv +# This is taken from SAMBA_PORT(grep without) +CONFIGURE_ARGS+= --without-python +CONFIGURE_ARGS+= --without-utmp +CONFIGURE_ARGS+= --without-winbind +CONFIGURE_ARGS+= --without-ads +CONFIGURE_ARGS+= --without-ldap +CONFIGURE_ARGS+= --without-ldapsam +CONFIGURE_ARGS+= --without-krb5 +CONFIGURE_ARGS+= --without-pam_smbpass do-build: cd ${WRKSRC} && ${MAKE} include/proto.h cd ${WRKSRC} && ${MAKE} libsmbclient do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include - ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${PREFIX}/lib/libsmbclient.so.0 - ${LN} -s ${PREFIX}/lib/libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so + ${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include + ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${PREFIX}/lib + ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so.0 ${PREFIX}/lib + ${LN} -snf libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/net/samba-libsmbclient/distinfo b/net/samba-libsmbclient/distinfo index da59ee4b4d3e..e69de29bb2d1 100644 --- a/net/samba-libsmbclient/distinfo +++ b/net/samba-libsmbclient/distinfo @@ -1,2 +0,0 @@ -MD5 (samba-3.0.2a.tar.bz2) = 72979a30ac450c8b0567c1ac9886884a -SIZE (samba-3.0.2a.tar.bz2) = 9289178 diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist index 6aa13f6c42f7..910dd705c206 100644 --- a/net/samba-libsmbclient/pkg-plist +++ b/net/samba-libsmbclient/pkg-plist @@ -1,3 +1,4 @@ include/libsmbclient.h +lib/libsmbclient.a lib/libsmbclient.so lib/libsmbclient.so.0 diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 4cd747650fa2..51072b300654 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -7,42 +7,19 @@ PORTNAME= samba PORTVERSION= 3.0.2.a -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= net +PORTREVISION?= 1 +PORTEPOCH?= 1 +CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= . rc DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/} -MAINTAINER= timur@gnu.org -COMMENT= A free SMB and CIFS client and server for UNIX +MAINTAINER?= timur@gnu.org +COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* - -OPTIONS= CUPS "With CUPS printing support" on \ - LDAP "With LDAP support" on \ - ADS "With Active Directory support" on \ - WINBIND "With WinBIND support" on \ - ACL_SUPPORT "With ACL support" off \ - SYSLOG "With Syslog support" off \ - QUOTAS "With Quota support" off \ - UTMP "With UTMP support" on \ - MSDFS "With MSDFS support" off \ - SAM_XML "With XML smbpasswd backend" off \ - SAM_MYSQL "With MYSQL smbpasswd backend" off \ - SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ - SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \ - PAM_SMBPASS "With SMB PAM module" off \ - PYTHON "With Python experimental bindings" off \ - LIBICONV "With installed ICONV library" off \ - POPT "With installed POPT library" on +CONFLICTS?= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* USE_BZIP2= yes -USE_RC_SUBR= yes -NO_LATEST_LINK= yes -INSTALLS_SHLIB= yes -USE_AUTOCONF_VER= 253 - # directories VARDIR= ${DESTDIR}/var SAMBA_SPOOL?= ${VARDIR}/spool/samba @@ -59,7 +36,8 @@ SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib -CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ + +CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ --libdir=${SAMBA_LIBDIR}/samba \ --localstatedir=${VARDIR} \ --with-configdir=${SAMBA_CONFDIR} \ @@ -68,11 +46,43 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \ --with-privatedir=${SAMBA_PRIVATE} \ --with-logfilebase=${SAMBA_LOGDIR} \ - --with-pam --with-readline --with-libsmbclient \ --with-manpages-langs=en +WRKSRC= ${WRKDIR}/${DISTNAME}/source + +# SUBPORTS end here +.if defined(SAMBA_SUBPORT) +.include <bsd.port.mk> +.else + +NO_LATEST_LINK= yes +INSTALLS_SHLIB= yes +USE_RC_SUBR= yes +USE_AUTOCONF_VER= 253 + +OPTIONS= CUPS "With CUPS printing support" on \ + LDAP "With LDAP support" on \ + ADS "With Active Directory support" on \ + WINBIND "With WinBIND support" on \ + ACL_SUPPORT "With ACL support" off \ + SYSLOG "With Syslog support" off \ + QUOTAS "With Quota support" off \ + UTMP "With UTMP support" on \ + MSDFS "With MSDFS support" off \ + SAM_XML "With XML smbpasswd backend" off \ + SAM_MYSQL "With MYSQL smbpasswd backend" off \ + SAM_PGSQL "With PostgreSQL smbpasswd backend" off \ + SAM_OLD_LDAP "With Samba2.x LDAP smbpasswd backend" off \ + PAM_SMBPASS "With SMB PAM module" off \ + PYTHON "With Python experimental bindings" off \ + LIBICONV "With installed ICONV library" off \ + POPT "With installed POPT library" on + .include <bsd.port.pre.mk> +CONFIGURE_ARGS+= --with-pam --with-readline \ + --with-libsmbclient + .if defined(WITH_PYTHON) USE_PYTHON= 2.1+ # Hack to make it work with OPTIONS. Breaks portlint @@ -233,8 +243,6 @@ LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt CONFIGURE_ARGS+= --with-included-popt .endif -WRKSRC= ${WRKDIR}/${DISTNAME}/source - MLINKS= samba.7 Samba.7 MAN1= findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \ smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \ @@ -356,3 +364,5 @@ post-install: .endif .include <bsd.port.post.mk> + +.endif |