From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 02:50:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CC2721C; Wed, 4 Jun 2014 02:50:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 08A7D265D; Wed, 4 Jun 2014 02:50:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s542o6lu084205; Wed, 4 Jun 2014 02:50:06 GMT (envelope-from timur@svn.freebsd.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s542o5Sr084199; Wed, 4 Jun 2014 02:50:05 GMT (envelope-from timur@svn.freebsd.org) Message-Id: <201406040250.s542o5Sr084199@svn.freebsd.org> From: "Timur I. Bakeyev" Date: Wed, 4 Jun 2014 02:50:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356422 - in head/net: samba-libsmbclient samba-nmblookup samba-smbclient X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 02:50:07 -0000 Author: timur Date: Wed Jun 4 02:50:05 2014 New Revision: 356422 URL: http://svnweb.freebsd.org/changeset/ports/356422 QAT: https://qat.redports.org/buildarchive/r356422/ Log: Converted to STAGEDIR Modified: head/net/samba-libsmbclient/Makefile head/net/samba-libsmbclient/pkg-plist head/net/samba-nmblookup/Makefile head/net/samba-smbclient/Makefile head/net/samba-smbclient/pkg-plist Modified: head/net/samba-libsmbclient/Makefile ============================================================================== --- head/net/samba-libsmbclient/Makefile Wed Jun 4 02:29:05 2014 (r356421) +++ head/net/samba-libsmbclient/Makefile Wed Jun 4 02:50:05 2014 (r356422) @@ -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" Modified: head/net/samba-libsmbclient/pkg-plist ============================================================================== --- head/net/samba-libsmbclient/pkg-plist Wed Jun 4 02:29:05 2014 (r356421) +++ head/net/samba-libsmbclient/pkg-plist Wed Jun 4 02:50:05 2014 (r356422) @@ -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 Modified: head/net/samba-nmblookup/Makefile ============================================================================== --- head/net/samba-nmblookup/Makefile Wed Jun 4 02:29:05 2014 (r356421) +++ head/net/samba-nmblookup/Makefile Wed Jun 4 02:50:05 2014 (r356422) @@ -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" Modified: head/net/samba-smbclient/Makefile ============================================================================== --- head/net/samba-smbclient/Makefile Wed Jun 4 02:29:05 2014 (r356421) +++ head/net/samba-smbclient/Makefile Wed Jun 4 02:50:05 2014 (r356422) @@ -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" Modified: head/net/samba-smbclient/pkg-plist ============================================================================== --- head/net/samba-smbclient/pkg-plist Wed Jun 4 02:29:05 2014 (r356421) +++ head/net/samba-smbclient/pkg-plist Wed Jun 4 02:50:05 2014 (r356422) @@ -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