ports/64523: Make samba-libsmbclient subport of samba-devel

Sun Mar 21 00:00:40 UTC 2004

>Number:         64523
>Category:       ports
>Synopsis:       Make samba-libsmbclient subport of samba-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 20 16:00:39 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Timur I. Bakeyev
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD com.bat.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Fri Dec 26 00:21:54 CET 2003 root at timur.home.bat.ru:/usr/src/sys/i386/compile/COMMON i386

>Description:

	Ports net/samba-devel and net/samba-libsmbclient both use the same Samba 3,
	share distinfo file and other parts of the build environment.

	From other side, they are potentially open to desync, as maintained by 
	different people and can be updated on a different time, forcing users
	to download two different versions of 10M distribution.

	So, my suggestion is to make libsmbclient port sub-port of samba-devel,
	so the PORTVERSION an distinfo as well as build environment will be in
	sync with each other.

>How-To-Repeat:

	Build both of them.

>Fix:

patch for samba-devel:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	samba-devel.diff
#
echo x - samba-devel.diff
sed 's/^X//' >samba-devel.diff << 'END-of-samba-devel.diff'
XIndex: Makefile
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-devel/Makefile,v
Xretrieving revision 1.111
Xdiff -u -r1.111 Makefile
X--- Makefile	16 Mar 2004 17:10:03 -0000	1.111
X+++ Makefile	20 Mar 2004 23:23:39 -0000
X@@ -7,42 +7,19 @@
X 
X PORTNAME=	samba
X PORTVERSION=	3.0.2.a
X-PORTREVISION=	1
X-PORTEPOCH=	1
X-CATEGORIES=	net
X+PORTREVISION?=	1
X+PORTEPOCH?=	1
X+CATEGORIES?=	net
X MASTER_SITES=	${MASTER_SITE_SAMBA}
X MASTER_SITE_SUBDIR=	. rc
X DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/}
X 
X-MAINTAINER=	timur at gnu.org
X-COMMENT=	A free SMB and CIFS client and server for UNIX
X+MAINTAINER?=	timur at gnu.org
X+COMMENT?=	A free SMB and CIFS client and server for UNIX
X 
X-CONFLICTS=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
X-
X-OPTIONS=	CUPS		"With CUPS printing support" on \
X-		LDAP		"With LDAP support" on \
X-		ADS		"With Active Directory support" on \
X-		WINBIND		"With WinBIND support" on \
X-		ACL_SUPPORT	"With ACL support" off \
X-		SYSLOG		"With Syslog support" off \
X-		QUOTAS		"With Quota support" off \
X-		UTMP		"With UTMP support" on \
X-		MSDFS		"With MSDFS support" off \
X-		SAM_XML		"With XML smbpasswd backend" off \
X-		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
X-		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
X-		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
X-		PAM_SMBPASS	"With SMB PAM module" off \
X-		PYTHON		"With Python experimental bindings" off \
X-		LIBICONV	"With installed ICONV library" off \
X-		POPT		"With installed POPT library" on
X+CONFLICTS?=	ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.*
X 
X USE_BZIP2=	yes
X-USE_RC_SUBR=	yes
X-NO_LATEST_LINK=	yes
X-INSTALLS_SHLIB=	yes
X-USE_AUTOCONF_VER=	253
X-
X # directories
X VARDIR=		${DESTDIR}/var
X SAMBA_SPOOL?=	${VARDIR}/spool/samba
X@@ -59,7 +36,8 @@
X 
X CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
X 		LDFLAGS=-L${LOCALBASE}/lib
X-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
X+
X+CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
X 		--libdir=${SAMBA_LIBDIR}/samba \
X 		--localstatedir=${VARDIR} \
X 		--with-configdir=${SAMBA_CONFDIR} \
X@@ -68,11 +46,43 @@
X 		--with-lockdir=${SAMBA_SPOOL} --with-piddir=${SAMBA_RUNDIR} \
X 		--with-privatedir=${SAMBA_PRIVATE} \
X 		--with-logfilebase=${SAMBA_LOGDIR} \
X-		--with-pam --with-readline --with-libsmbclient \
X 		--with-manpages-langs=en
X 
X+WRKSRC=		${WRKDIR}/${DISTNAME}/source
X+
X+# SUBPORTS end here
X+.if defined(SAMBA_SUBPORT)
X+.include <bsd.port.mk>
X+.else
X+
X+NO_LATEST_LINK=	yes
X+INSTALLS_SHLIB=	yes
X+USE_RC_SUBR=	yes
X+USE_AUTOCONF_VER=	253
X+
X+OPTIONS=	CUPS		"With CUPS printing support" on \
X+		LDAP		"With LDAP support" on \
X+		ADS		"With Active Directory support" on \
X+		WINBIND		"With WinBIND support" on \
X+		ACL_SUPPORT	"With ACL support" off \
X+		SYSLOG		"With Syslog support" off \
X+		QUOTAS		"With Quota support" off \
X+		UTMP		"With UTMP support" on \
X+		MSDFS		"With MSDFS support" off \
X+		SAM_XML		"With XML smbpasswd backend" off \
X+		SAM_MYSQL	"With MYSQL smbpasswd backend" off \
X+		SAM_PGSQL	"With PostgreSQL smbpasswd backend" off \
X+		SAM_OLD_LDAP	"With Samba2.x LDAP smbpasswd backend" off \
X+		PAM_SMBPASS	"With SMB PAM module" off \
X+		PYTHON		"With Python experimental bindings" off \
X+		LIBICONV	"With installed ICONV library" off \
X+		POPT		"With installed POPT library" on
X+
X .include <bsd.port.pre.mk>
X 
X+CONFIGURE_ARGS+=	--with-pam --with-readline \
X+			--with-libsmbclient
X+
X .if defined(WITH_PYTHON)
X USE_PYTHON=		2.1+
X # Hack to make it work with OPTIONS. Breaks portlint
X@@ -233,8 +243,6 @@
X CONFIGURE_ARGS+=	--with-included-popt
X .endif
X 
X-WRKSRC=		${WRKDIR}/${DISTNAME}/source
X-
X MLINKS=		samba.7 Samba.7
X MAN1=		findsmb.1 nmblookup.1 log2pcap.1 rpcclient.1 \
X 		smbget.1 smbcacls.1 smbclient.1 smbcontrol.1 smbsh.1 \
X@@ -356,3 +364,5 @@
X .endif
X 
X .include <bsd.port.post.mk>
X+
X+.endif
END-of-samba-devel.diff
exit

patch for samba-libsmbclient:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	samba-libsmbclient.diff
#
echo x - samba-libsmbclient.diff
sed 's/^X//' >samba-libsmbclient.diff << 'END-of-samba-libsmbclient.diff'
XIndex: Makefile
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-libsmbclient/Makefile,v
Xretrieving revision 1.12
Xdiff -u -r1.12 Makefile
X--- Makefile	11 Mar 2004 09:58:03 -0000	1.12
X+++ Makefile	20 Mar 2004 23:07:40 -0000
X@@ -5,33 +5,45 @@
X # $FreeBSD: ports/net/samba-libsmbclient/Makefile,v 1.12 2004/03/11 09:58:03 osa Exp $
X #
X 
X-PORTNAME=	samba
X-PORTVERSION=	3.0.2a
X-CATEGORIES=	net
X-MASTER_SITES=	${MASTER_SITE_SAMBA}
X-MASTER_SITE_SUBDIR=	. old-versions
X-PKGNAMESUFFIX=	-libsmbclient
X+PORTREVISION=		0
X+PORTEPOCH=		0
X+PKGNAMESUFFIX=		-libsmbclient
X 
X-MAINTAINER=	kwm at rainbow-runner.nl
X-COMMENT=	The shared lib from the samba packages
X+MAINTAINER=		kwm at rainbow-runner.nl
X+COMMENT=		The shared lib from the samba packages
X 
X-USE_BZIP2=		yes
X-USE_SIZE=		yes
X+CONFLICTS=		samba-3.*
X+
X+USE_ICONV=		yes
X GNU_CONFIGURE=		yes
X INSTALLS_SHLIB=		yes
X 
X-WRKSRC=		${WRKDIR}/${DISTNAME}/source
X+SAMBA_PORT=		samba-devel
X+SAMBA_SUBPORT=		yes
X 
X-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
X-		LDFLAGS=-L${LOCALBASE}/lib
X+MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
X+PKGDIR=			${.CURDIR}
X+# We WANT libsmbclient support :)
X+CONFIGURE_ARGS+=	--with-libsmbclient
X+CONFIGURE_ARGS+=	--with-libiconv
X+# This is taken from SAMBA_PORT(grep without)
X+CONFIGURE_ARGS+=	--without-python
X+CONFIGURE_ARGS+=	--without-utmp
X+CONFIGURE_ARGS+=	--without-winbind
X+CONFIGURE_ARGS+=	--without-ads
X+CONFIGURE_ARGS+=	--without-ldap
X+CONFIGURE_ARGS+=	--without-ldapsam
X+CONFIGURE_ARGS+=	--without-krb5
X+CONFIGURE_ARGS+=	--without-pam_smbpass
X 
X do-build:
X 	cd ${WRKSRC} && ${MAKE} include/proto.h
X 	cd ${WRKSRC} && ${MAKE} libsmbclient
X 
X do-install:
X-	${INSTALL_SCRIPT} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
X-	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${PREFIX}/lib/libsmbclient.so.0
X-	${LN} -s ${PREFIX}/lib/libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
X+	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
X+	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${PREFIX}/lib
X+	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so.0 ${PREFIX}/lib
X+	${LN} -snf libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
X 
X-.include <bsd.port.mk>
X+.include "${MASTERDIR}/Makefile"
XIndex: distinfo
X===================================================================
XRCS file: distinfo
Xdiff -N distinfo
X--- distinfo	27 Feb 2004 08:13:19 -0000	1.7
X+++ /dev/null	1 Jan 1970 00:00:00 -0000
X@@ -1,2 +0,0 @@
X-MD5 (samba-3.0.2a.tar.bz2) = 72979a30ac450c8b0567c1ac9886884a
X-SIZE (samba-3.0.2a.tar.bz2) = 9289178
XIndex: pkg-plist
X===================================================================
XRCS file: /home/ncvs/ports/net/samba-libsmbclient/pkg-plist,v
Xretrieving revision 1.1
Xdiff -u -r1.1 pkg-plist
X--- pkg-plist	25 Jul 2003 04:42:08 -0000	1.1
X+++ pkg-plist	20 Mar 2004 23:07:40 -0000
X@@ -1,3 +1,4 @@
X include/libsmbclient.h
X+lib/libsmbclient.a
X lib/libsmbclient.so
X lib/libsmbclient.so.0
END-of-samba-libsmbclient.diff
exit

>Release-Note:
>Audit-Trail:
>Unformatted: