Date: Sun, 29 Sep 2013 09:38:58 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> 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 Message-ID: <201309290938.r8T9cwAZ063590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> .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 <bsd.port.mk> 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 <bsd.port.options.mk> .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 <bsd.port.mk> 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 <bsd.port.options.mk> .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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309290938.r8T9cwAZ063590>