From e1275c6fe3f80fc45c946338fb171ee68b0317fe Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Wed, 4 Jun 2014 02:50:05 +0000 Subject: [PATCH] Converted to STAGEDIR --- net/samba-libsmbclient/Makefile | 32 ++++++++++++-------------------- net/samba-libsmbclient/pkg-plist | 1 + net/samba-nmblookup/Makefile | 17 ++++++++--------- net/samba-smbclient/Makefile | 18 ++++++------------ net/samba-smbclient/pkg-plist | 2 +- 5 files changed, 28 insertions(+), 42 deletions(-) diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile index 53914080c2f4..8092247e2c61 100644 --- a/net/samba-libsmbclient/Makefile +++ b/net/samba-libsmbclient/Makefile @@ -18,28 +18,20 @@ USE_LDCONFIG= ${PREFIX}/lib # We WANT shared libs CONFIGURE_ARGS+= --with-libsmbclient -SAMBA_INSTALL_LIBS= libsmbclient -MAN7= libsmbclient.7 +ALL_TARGET= libsmbclient -ALL_TARGET= ${SAMBA_INSTALL_LIBS} - -NO_STAGE= yes 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 - ${INSTALL_DATA} ${WRKSRC}/pkgconfig/smbclient.pc ${PREFIX}/libdata/pkgconfig/ - -@${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} + -@${MKDIR} ${STAGEDIR}${MAN7PREFIX}/man/man7 + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/libsmbclient.7 ${STAGEDIR}${MAN7PREFIX}/man/man7 + -@${MKDIR} ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/pkgconfig/smbclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ + -@${MKDIR} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${STAGEDIR}${PREFIX}/lib/libsmbclient.so.0 + ${LN} -snf libsmbclient.so.0 ${STAGEDIR}${PREFIX}/lib/libsmbclient.so + -@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${STAGEDIR}${EXAMPLESDIR} .include "${MASTERDIR}/Makefile" diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist index 1ff83f8fbe5e..dea35399e241 100644 --- a/net/samba-libsmbclient/pkg-plist +++ b/net/samba-libsmbclient/pkg-plist @@ -3,6 +3,7 @@ lib/libsmbclient.a lib/libsmbclient.so lib/libsmbclient.so.0 libdata/pkgconfig/smbclient.pc +man/man7/libsmbclient.7.gz %%EXAMPLESDIR%%/Makefile %%EXAMPLESDIR%%/Makefile.internal %%EXAMPLESDIR%%/Makefile.internal.in diff --git a/net/samba-nmblookup/Makefile b/net/samba-nmblookup/Makefile index 009a98e5a08a..904c3c63d1aa 100644 --- a/net/samba-nmblookup/Makefile +++ b/net/samba-nmblookup/Makefile @@ -15,20 +15,19 @@ SAMBA_SUBPORT= yes MASTERDIR= ${.CURDIR}/../${SAMBA_PORT} PKGDIR= ${.CURDIR} -MAN1= nmblookup.1 -MAN5= smb.conf.5 -PLIST_FILES= bin/nmblookup +PLIST_FILES= bin/nmblookup \ + man/man1/nmblookup.1.gz \ + man/man5/smb.conf.5.gz WITHOUT_ADS= yes ALL_TARGET= bin/nmblookup -NO_STAGE= yes 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 + -@${MKDIR} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/nmblookup ${STAGEDIR}${PREFIX}/bin + -@${MKDIR} ${MAN1PREFIX}/man/man1 ${STAGEDIR}${MAN5PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/nmblookup.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smb.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 .include "${MASTERDIR}/Makefile" diff --git a/net/samba-smbclient/Makefile b/net/samba-smbclient/Makefile index 270f6224ec35..8f3b91dab093 100644 --- a/net/samba-smbclient/Makefile +++ b/net/samba-smbclient/Makefile @@ -20,23 +20,17 @@ PKGDIR= ${.CURDIR} WITHOUT_ADS= yes -MAN1= smbclient.1 - PLIST_SUB+= SAMBA_CONFDIR="${SAMBA_CONFDIR:S,^${PREFIX}/,,}" \ SAMBA_CONFIG="${SAMBA_CONFIG}" ALL_TARGET= bin/smbclient -NO_STAGE= yes 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 + -@${MKDIR} ${STAGEDIR}${SAMBA_CONFDIR} + ${INSTALL_DATA} ${FILESDIR}/smb-client.conf.sample ${STAGEDIR}${SAMBA_CONFDIR}/${SAMBA_CONFIG}.sample + -@${MKDIR} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/smbclient ${STAGEDIR}${PREFIX}/bin + -@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/smbclient.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include "${MASTERDIR}/Makefile" diff --git a/net/samba-smbclient/pkg-plist b/net/samba-smbclient/pkg-plist index d12567727048..23dd7f363bf8 100644 --- a/net/samba-smbclient/pkg-plist +++ b/net/samba-smbclient/pkg-plist @@ -1,3 +1,3 @@ bin/smbclient -@unexec if cmp -s %D/%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%% %D/%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample; then rm -f %D/%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%; fi +man/man1/smbclient.1.gz %%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%.sample