- Convert samba-libsmbclient into a slave port of samba-devel.

PR:		ports/64523
Submitted by:	Timur I. Bakeyev <timur@com.bat.ru> (samba-devel maintainer)
Approved by:	Koop Mast <kwm@rainbow-runner.nl> (samba-libsmbclient maintainer)

net/samba-devel/Makefile

@@ -7,17 +7,58 @@
 
 PORTNAME=	samba
 PORTVERSION=	3.0.2.a
-PORTREVISION=	1
+PORTREVISION?=	1
-PORTEPOCH=	1
+PORTEPOCH?=	1
-CATEGORIES=	net
+CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. rc
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
 
-MAINTAINER=	timur@gnu.org
+MAINTAINER?=	timur@gnu.org
-COMMENT=	A free SMB and CIFS client and server for UNIX
+COMMENT?=	A free SMB and CIFS client and server for UNIX
 
-CONFLICTS=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
+CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
+
+USE_BZIP2=	yes
+# directories
+VARDIR=		${DESTDIR}/var
+SAMBA_SPOOL?=	${VARDIR}/spool/samba
+SAMBA_LOGDIR=	${VARDIR}/log/samba
+SAMBA_RUNDIR=	${VARDIR}/run
+SAMBA_PRIVATE?=	${PREFIX}/private
+SAMBA_CONFDIR?=	${PREFIX}/etc
+SAMBA_SWATDIR=	${PREFIX}/share/swat
+SAMBA_LIBDIR=	${PREFIX}/lib
+DOCSDIR?=	${PREFIX}/share/doc/samba
+EXAMPLESDIR?=	${PREFIX}/share/examples/samba
+RC_DIR?=	${SAMBA_CONFDIR}/rc.d
+SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
+
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
+		--libdir=${SAMBA_LIBDIR}/samba \
+		--localstatedir=${VARDIR} \
+		--with-configdir=${SAMBA_CONFDIR} \
+		--with-swatdir=${SAMBA_SWATDIR} \
+		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
+		--with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
+		--with-privatedir=${SAMBA_PRIVATE} \
+		--with-logfilebase=${SAMBA_LOGDIR} \
+		--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 \
@@ -37,42 +78,11 @@ OPTIONS=	CUPS		"With CUPS printing support" on \
 		LIBICONV	"With installed ICONV library" off \
 		POPT		"With installed POPT library" on
 
-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
-SAMBA_LOGDIR=	${VARDIR}/log/samba
-SAMBA_RUNDIR=	${VARDIR}/run
-SAMBA_PRIVATE?=	${PREFIX}/private
-SAMBA_CONFDIR?=	${PREFIX}/etc
-SAMBA_SWATDIR=	${PREFIX}/share/swat
-SAMBA_LIBDIR=	${PREFIX}/lib
-DOCSDIR?=	${PREFIX}/share/doc/samba
-EXAMPLESDIR?=	${PREFIX}/share/examples/samba
-RC_DIR?=	${SAMBA_CONFDIR}/rc.d
-SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
-
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--libdir=${SAMBA_LIBDIR}/samba \
-		--localstatedir=${VARDIR} \
-		--with-configdir=${SAMBA_CONFDIR} \
-		--with-swatdir=${SAMBA_SWATDIR} \
-		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
-		--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
-
 .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

net/samba-libsmbclient/Makefile

@@ -5,33 +5,45 @@
 # $FreeBSD$
 #
 
-PORTNAME=	samba
+PORTREVISION=		0
-PORTVERSION=	3.0.2a
+PORTEPOCH=		0
-CATEGORIES=	net
+PKGNAMESUFFIX=		-libsmbclient
-MASTER_SITES=	${MASTER_SITE_SAMBA}
-MASTER_SITE_SUBDIR=	. old-versions
-PKGNAMESUFFIX=	-libsmbclient
 
-MAINTAINER=	kwm@rainbow-runner.nl
+MAINTAINER=		kwm@rainbow-runner.nl
-COMMENT=	The shared lib from the samba packages
+COMMENT=		The shared lib from the samba packages
 
-USE_BZIP2=		yes
+CONFLICTS=		samba-3.*
-USE_SIZE=		yes
+
+USE_ICONV=		yes
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
+SAMBA_PORT=		samba-devel
+SAMBA_SUBPORT=		yes
 
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
-		LDFLAGS=-L${LOCALBASE}/lib
+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_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${PREFIX}/lib/libsmbclient.so.0
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${PREFIX}/lib
-	${LN} -s ${PREFIX}/lib/libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
+	${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"

net/samba-libsmbclient/distinfo

@@ -1,2 +0,0 @@
-MD5 (samba-3.0.2a.tar.bz2) = 72979a30ac450c8b0567c1ac9886884a
-SIZE (samba-3.0.2a.tar.bz2) = 9289178

net/samba-libsmbclient/pkg-plist

@@ -1,3 +1,4 @@
 include/libsmbclient.h
+lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0

net/samba3/Makefile

@@ -7,17 +7,58 @@
 
 PORTNAME=	samba
 PORTVERSION=	3.0.2.a
-PORTREVISION=	1
+PORTREVISION?=	1
-PORTEPOCH=	1
+PORTEPOCH?=	1
-CATEGORIES=	net
+CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. rc
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
 
-MAINTAINER=	timur@gnu.org
+MAINTAINER?=	timur@gnu.org
-COMMENT=	A free SMB and CIFS client and server for UNIX
+COMMENT?=	A free SMB and CIFS client and server for UNIX
 
-CONFLICTS=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
+CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
+
+USE_BZIP2=	yes
+# directories
+VARDIR=		${DESTDIR}/var
+SAMBA_SPOOL?=	${VARDIR}/spool/samba
+SAMBA_LOGDIR=	${VARDIR}/log/samba
+SAMBA_RUNDIR=	${VARDIR}/run
+SAMBA_PRIVATE?=	${PREFIX}/private
+SAMBA_CONFDIR?=	${PREFIX}/etc
+SAMBA_SWATDIR=	${PREFIX}/share/swat
+SAMBA_LIBDIR=	${PREFIX}/lib
+DOCSDIR?=	${PREFIX}/share/doc/samba
+EXAMPLESDIR?=	${PREFIX}/share/examples/samba
+RC_DIR?=	${SAMBA_CONFDIR}/rc.d
+SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
+
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
+		--libdir=${SAMBA_LIBDIR}/samba \
+		--localstatedir=${VARDIR} \
+		--with-configdir=${SAMBA_CONFDIR} \
+		--with-swatdir=${SAMBA_SWATDIR} \
+		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
+		--with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
+		--with-privatedir=${SAMBA_PRIVATE} \
+		--with-logfilebase=${SAMBA_LOGDIR} \
+		--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 \
@@ -37,42 +78,11 @@ OPTIONS=	CUPS		"With CUPS printing support" on \
 		LIBICONV	"With installed ICONV library" off \
 		POPT		"With installed POPT library" on
 
-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
-SAMBA_LOGDIR=	${VARDIR}/log/samba
-SAMBA_RUNDIR=	${VARDIR}/run
-SAMBA_PRIVATE?=	${PREFIX}/private
-SAMBA_CONFDIR?=	${PREFIX}/etc
-SAMBA_SWATDIR=	${PREFIX}/share/swat
-SAMBA_LIBDIR=	${PREFIX}/lib
-DOCSDIR?=	${PREFIX}/share/doc/samba
-EXAMPLESDIR?=	${PREFIX}/share/examples/samba
-RC_DIR?=	${SAMBA_CONFDIR}/rc.d
-SAMBA_CONFIG=	${SAMBA_CONFDIR}/smb.conf
-
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--libdir=${SAMBA_LIBDIR}/samba \
-		--localstatedir=${VARDIR} \
-		--with-configdir=${SAMBA_CONFDIR} \
-		--with-swatdir=${SAMBA_SWATDIR} \
-		--with-sambabook=${SAMBA_SWATDIR}/using_samba \
-		--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
-
 .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