From owner-svn-ports-head@FreeBSD.ORG Sun Sep 29 09:38:59 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 1C853E9D; Sun, 29 Sep 2013 09:38:59 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0AC632E3A; Sun, 29 Sep 2013 09:38:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8T9cwVP063598; Sun, 29 Sep 2013 09:38:58 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8T9cwAZ063590; Sun, 29 Sep 2013 09:38:58 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201309290938.r8T9cwAZ063590@svn.freebsd.org> From: Guido Falsi Date: Sun, 29 Sep 2013 09:38:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328659 - in head/net: unison unison-devel unison-nox11 unison232 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 09:38:59 -0000 Author: madpilot Date: Sun Sep 29 09:38:57 2013 New Revision: 328659 URL: http://svnweb.freebsd.org/changeset/ports/328659 Log: Convert unison ports to staging Approved by: bsam (for net/unison-nox11) Approved by: mandree (implicit, for net/unison232) Modified: head/net/unison-devel/Makefile head/net/unison-nox11/Makefile head/net/unison/Makefile head/net/unison232/Makefile Modified: head/net/unison-devel/Makefile ============================================================================== --- head/net/unison-devel/Makefile Sun Sep 29 09:31:56 2013 (r328658) +++ head/net/unison-devel/Makefile Sun Sep 29 09:38:57 2013 (r328659) @@ -28,7 +28,6 @@ OPTIONS_DEFAULT= DOCS X11 MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDOCS} @@ -54,6 +53,7 @@ MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 PATCH_DEPENDS+= ${BUILD_DEPENDS} +PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 .endif .if ${PORT_OPTIONS:MX11} @@ -69,26 +69,21 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin post-install: .if ${PORT_OPTIONS:MX11} - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin .endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin - @${MKDIR} ${DESKTOPDIR} - @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} + @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} @-update-desktop-database > /dev/null - @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${PREFIX}/share/pixmaps/${PORTNAME}.png - @${CAT} ${PKGMESSAGE} -.else - @${CAT} ${PKGMESSAGE}.nox11 + @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Modified: head/net/unison-nox11/Makefile ============================================================================== --- head/net/unison-nox11/Makefile Sun Sep 29 09:31:56 2013 (r328658) +++ head/net/unison-nox11/Makefile Sun Sep 29 09:38:57 2013 (r328659) @@ -13,5 +13,4 @@ OPTIONS_EXCLUDE= X11 OPTIONS_DEFAULT= DOCS MASTERDIR= ${.CURDIR}/../unison -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Sun Sep 29 09:31:56 2013 (r328658) +++ head/net/unison/Makefile Sun Sep 29 09:38:57 2013 (r328659) @@ -27,7 +27,6 @@ ALL_TARGET= unison all OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT?= DOCS X11 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDOCS} @@ -53,6 +52,7 @@ MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 PATCH_DEPENDS+= ${BUILD_DEPENDS} +PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 .endif .if ${PORT_OPTIONS:MX11} @@ -68,23 +68,18 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin - @${MKDIR} ${DESKTOPDIR} - @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} + @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} @-update-desktop-database > /dev/null - @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${PREFIX}/share/pixmaps/${PORTNAME}.png - @${CAT} ${PKGMESSAGE} -.else - @${CAT} ${PKGMESSAGE}.nox11 + @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Sun Sep 29 09:31:56 2013 (r328658) +++ head/net/unison232/Makefile Sun Sep 29 09:38:57 2013 (r328659) @@ -18,7 +18,7 @@ COMMENT= User-level file synchronization LICENSE= GPLv3 PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GMAKE= yes +USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" @@ -27,7 +27,6 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDOCS} @@ -69,20 +68,18 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} + cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text - ${MKDIR} ${DESKTOPDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text + ${MKDIR} ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop -update-desktop-database > /dev/null - @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png + @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png .endif .include