3 files changed, 25 insertions, 74 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index e92d96c3395c..2ddefcb277c9 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	samba-libsmbclient
-# Date created:				23 Juli 2003
-# Whom:					Koop Mast <einekoai@chello.nl>
-#
 # $FreeBSD$
-#
 
 PORTREVISION=		0
 PORTEPOCH=		0
 PKGNAMESUFFIX=		-libsmbclient
 
-COMMENT=		Shared libs from the samba package
+COMMENT=		Shared lib from the samba package
 
 CONFLICTS=
 
-SAMBA_PORT=		samba34
+SAMBA_PORT=		samba36
 SAMBA_SUBPORT=		yes
 
 MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
@@ -21,9 +16,28 @@ PKGDIR=			${.CURDIR}
 
 USE_LDCONFIG=		${PREFIX}/lib
 
-OPTIONS=		ADS		"With Active Directory support" off \
-			ADDNS		"Build the libaddns shared library" off \
-			NETAPI		"Build the libnetapi shared library" off \
-			SHAREMODES	"Build the libsharemodes shared library" off
+# We WANT shared libs
+CONFIGURE_ARGS+=	--with-libsmbclient
+SAMBA_INSTALL_LIBS=	libsmbclient
+
+MAN7=			libsmbclient.7
+
+ALL_TARGET=		${SAMBA_INSTALL_LIBS}
+
+do-install:
+			-@${MKDIR} ${MAN7PREFIX}/man/man7
+.for man in ${MAN7}
+			${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN7PREFIX}/man/man7
+.endfor
+			-@${MKDIR} ${PREFIX}/include
+			${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
+			-@${MKDIR} ${PREFIX}/lib
+.for lib in ${SAMBA_INSTALL_LIBS}
+			${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
+			${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
+			${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
+.endfor
+			-@${MKDIR} ${EXAMPLESDIR}
+			@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${EXAMPLESDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/samba-libsmbclient/Makefile.inc b/net/samba-libsmbclient/Makefile.inc
deleted file mode 100644
index d05bd1759de9..000000000000
--- a/net/samba-libsmbclient/Makefile.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-# We WANT shared libs
-CONFIGURE_ARGS+=	--with-libsmbclient
-SAMBA_INSTALL_LIBS=	libsmbclient
-
-.if defined(WITH_ADDNS)
-CONFIGURE_ARGS+=	--with-libaddns
-SAMBA_INSTALL_LIBS+=	libaddns
-PLIST_SUB+=		ADDNS=""
-.else
-CONFIGURE_ARGS+=	--without-libaddns
-PLIST_SUB+=		ADDNS="@comment "
-.endif
-
-.if defined(WITH_SHAREMODES)
-CONFIGURE_ARGS+=	--with-libsmbsharemodes
-SAMBA_INSTALL_LIBS+=	libsmbsharemodes
-PLIST_SUB+=		SHAREMODES=""
-.else
-CONFIGURE_ARGS+=	--without-libsmbsharemodes
-PLIST_SUB+=		SHAREMODES="@comment "
-.endif
-
-.if defined(WITH_NETAPI)
-CONFIGURE_ARGS+=	--with-libnetapi
-SAMBA_INSTALL_LIBS+=	libnetapi
-PLIST_SUB+=		NETAPI=""
-.else
-CONFIGURE_ARGS+=	--without-libnetapi
-PLIST_SUB+=		NETAPI="@comment "
-.endif
-
-MAN7=			libsmbclient.7
-
-ALL_TARGET=		libtdb ${SAMBA_INSTALL_LIBS}
-
-do-install:
-	-@${MKDIR} ${MAN7PREFIX}/man/man7
-.for man in ${MAN7}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN7PREFIX}/man/man7
-.endfor
-	-@${MKDIR} ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-.if defined(WITH_ADDNS)
-	${INSTALL_DATA} ${WRKSRC}/libaddns/addns.h ${PREFIX}/include
-.endif
-	-@${MKDIR} ${PREFIX}/lib
-.for lib in ${SAMBA_INSTALL_LIBS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
-	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
-.endfor
-	-@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${EXAMPLESDIR}
diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist
index be4a25228b1f..dcfbbc1726f5 100644
--- a/net/samba-libsmbclient/pkg-plist
+++ b/net/samba-libsmbclient/pkg-plist
@@ -1,17 +1,7 @@
 include/libsmbclient.h
-%%ADDNS%%include/addns.h
 lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-%%ADDNS%%lib/libaddns.a
-%%ADDNS%%lib/libaddns.so
-%%ADDNS%%lib/libaddns.so.0
-%%NETAPI%%lib/libnetapi.a
-%%NETAPI%%lib/libnetapi.so
-%%NETAPI%%lib/libnetapi.so.0
-%%SHAREMODES%%lib/libsmbsharemodes.a
-%%SHAREMODES%%lib/libsmbsharemodes.so
-%%SHAREMODES%%lib/libsmbsharemodes.so.0
 %%EXAMPLESDIR%%/Makefile
 %%EXAMPLESDIR%%/Makefile.internal
 %%EXAMPLESDIR%%/Makefile.internal.in