diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2010-02-05 01:19:29 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2010-02-05 01:19:29 +0000 |
| commit | 727c62fe484e2881bf59a62744b3dcf4cc797e0c (patch) | |
| tree | a49377ec8ac838216015e7c39cd6ec6546840c62 | |
| parent | 0044f060cce21b8057d8d5eb71b17eef89e00599 (diff) | |
| download | ports-727c62fe484e2881bf59a62744b3dcf4cc797e0c.tar.gz ports-727c62fe484e2881bf59a62744b3dcf4cc797e0c.zip | |
Update to Samba34
Notes
Notes:
svn path=/head/; revision=249253
| -rw-r--r-- | net/samba-nmblookup/Makefile | 10 | ||||
| -rw-r--r-- | net/samba-smbclient/Makefile | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/net/samba-nmblookup/Makefile b/net/samba-nmblookup/Makefile index fcaf248d60b2..480557a5db55 100644 --- a/net/samba-nmblookup/Makefile +++ b/net/samba-nmblookup/Makefile @@ -11,9 +11,9 @@ PKGNAMESUFFIX= -nmblookup COMMENT= NetBIOS Name lookup tool -CONFLICTS= ja-samba-2.* ja-samba-3.* samba-2.* samba-3.* +CONFLICTS= ja-samba-[23].* samba-[2-4].* -SAMBA_PORT?= samba3 +SAMBA_PORT= samba34 SAMBA_SUBPORT= yes MASTERDIR= ${.CURDIR}/../${SAMBA_PORT} @@ -25,12 +25,12 @@ PLIST_FILES= bin/nmblookup WITHOUT_ADS= yes -do-build: - cd ${WRKSRC} && ${MAKE} include/proto.h - cd ${WRKSRC} && ${MAKE} bin/nmblookup +ALL_TARGET= libtdb bin/nmblookup do-install: + -@${MKDIR} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/nmblookup ${PREFIX}/bin + -@${MKDIR} ${MAN1PREFIX}/man/man1 ${MAN5PREFIX}/man/man5 ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/nmblookup.1 ${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smb.conf.5 ${MAN5PREFIX}/man/man5 diff --git a/net/samba-smbclient/Makefile b/net/samba-smbclient/Makefile index 4d91c5c4431b..be9cb8f54c6a 100644 --- a/net/samba-smbclient/Makefile +++ b/net/samba-smbclient/Makefile @@ -11,12 +11,13 @@ PKGNAMESUFFIX= -smbclient COMMENT= Samba "ftp-like" client -CONFLICTS= ja-samba-2.* ja-samba-3.* samba-2.* samba-3.* +CONFLICTS= ja-samba-[23].* samba-[2-4].* -SAMBA_CONFIG= smb-client.conf -SAMBA_PORT?= samba3 +SAMBA_PORT= samba34 SAMBA_SUBPORT= yes +SAMBA_CONFIG= smb-client.conf + MASTERDIR= ${.CURDIR}/../${SAMBA_PORT} FILESDIR= ${.CURDIR}/files PKGDIR= ${.CURDIR} @@ -28,16 +29,17 @@ MAN1= smbclient.1 PLIST_SUB+= SAMBA_CONFDIR="${SAMBA_CONFDIR:S,^${PREFIX}/,,}" \ SAMBA_CONFIG="${SAMBA_CONFIG}" -do-build: - cd ${WRKSRC} && ${MAKE} include/proto.h - cd ${WRKSRC} && ${MAKE} bin/smbclient +ALL_TARGET= libtdb bin/smbclient do-install: + -@${MKDIR} ${SAMBA_CONFDIR} ${INSTALL_DATA} ${FILESDIR}/smb-client.conf.sample ${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample @if [ ! -f "${SAMBA_CONFDIR}/${SAMBA_CONFIG}" ]; then \ ${CP} -p "${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample" "${SAMBA_CONFDIR}/${SAMBA_CONFIG}"; \ fi + -@${MKDIR} ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbclient ${PREFIX}/bin + -@${MKDIR} ${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smbclient.1 ${MAN1PREFIX}/man/man1 .include "${MASTERDIR}/Makefile" |