Date: Thu, 3 Jul 2014 21:54:14 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360464 - in head/deskutils: gnote hot-babe pinot pypanel qlabels Message-ID: <201407032154.s63LsEIX006215@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jul 3 21:54:14 2014 New Revision: 360464 URL: http://svnweb.freebsd.org/changeset/ports/360464 QAT: https://qat.redports.org/buildarchive/r360464/ Log: Nuke NOPORTDOCS. Convert a couple WITH_foo's to OPTIONS. Modified: head/deskutils/gnote/Makefile head/deskutils/hot-babe/Makefile head/deskutils/pinot/Makefile head/deskutils/pypanel/Makefile head/deskutils/qlabels/Makefile Modified: head/deskutils/gnote/Makefile ============================================================================== --- head/deskutils/gnote/Makefile Thu Jul 3 21:48:44 2014 (r360463) +++ head/deskutils/gnote/Makefile Thu Jul 3 21:54:14 2014 (r360464) @@ -35,14 +35,12 @@ CONFIGURE_ARGS= --disable-dbus DOCS= AUTHORS ChangeLog NEWS README TODO MAN1= gnote.1 -.if !defined(WITHOUT_APPLET) -LIB_DEPENDS+= libpanelappletmm-2.6.so:${PORTSDIR}/x11-toolkits/libpanelappletmm -CONFIGURE_ARGS+=--enable-applet -PLIST_SUB+= APPLET="" -.else -CONFIGURE_ARGS+=--disable-applet -PLIST_SUB+= APPLET="@comment " -.endif +OPTIONS_DEFINE= DOCS APPLET +OPTIONS_DEFAULT=APPLET +OPTIONS_SUB= yes + +APPLET_LIB_DEPENDS= libpanelappletmm-2.6.so:${PORTSDIR}/x11-toolkits/libpanelappletmm +APPLET_CONFIGURE_ENABLE=applet PLIST_SUB+= VERSION=${PORTVERSION} @@ -50,12 +48,10 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \ ${WRKSRC}/configure -.ifndef (NOPORTDOCS) post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/deskutils/hot-babe/Makefile ============================================================================== --- head/deskutils/hot-babe/Makefile Thu Jul 3 21:48:44 2014 (r360463) +++ head/deskutils/hot-babe/Makefile Thu Jul 3 21:54:14 2014 (r360464) @@ -18,6 +18,8 @@ USE_GNOME= gtk20 PORTDOCS= ChangeLog NEWS TODO LICENSE CONTRIBUTORS copyright config.example +OPTIONS_DEFINE= DOCS + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning! This port contains some adults only content." @@ -26,11 +28,9 @@ pre-everything:: post-install: ${INSTALL_MAN} ${WRKSRC}/hot-babe.1 ${STAGEDIR}${PREFIX}/man/man1 -.ifndef (NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/deskutils/pinot/Makefile ============================================================================== --- head/deskutils/pinot/Makefile Thu Jul 3 21:48:44 2014 (r360463) +++ head/deskutils/pinot/Makefile Thu Jul 3 21:54:14 2014 (r360464) @@ -54,18 +54,13 @@ USE_LDCONFIG= ${PREFIX}/lib/pinot/backen SHEBANG_LANG= bash SHEBANG_FILES= scripts/bash/*.sh -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -.if defined(WITH_CHMLIB) -CONFIGURE_ARGS+= --enable-chmlib=yes -LIB_DEPENDS+= libchm.so:${PORTSDIR}/misc/chmlib -PLIST_SUB+= CHMLIB="" -.else -CONFIGURE_ARGS+= --disable-chmlib -PLIST_SUB+= CHMLIB="@comment " -.endif +OPTIONS_DEFINE= DEBUG CHMLIB DOCS +OPTIONS_SUB= yes + +DEBUG_CONFIGURE_ENABLE= debug-yes + +CHMLIB_CONFIGURE_ENABLE= chmlib=yes +CHMLIB_LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib INSTALLS_ICONS= yes @@ -99,9 +94,7 @@ pre-configure: post-install: ${TOUCH} ${STAGEDIR}${DATADIR}/stopwords/.empty_file -.if !defined(NOPORTDOCS) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/deskutils/pypanel/Makefile ============================================================================== --- head/deskutils/pypanel/Makefile Thu Jul 3 21:48:44 2014 (r360463) +++ head/deskutils/pypanel/Makefile Thu Jul 3 21:54:14 2014 (r360464) @@ -24,6 +24,8 @@ PYDISTUTILS_PKGNAME= PyPanel PORTDOCS= * +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e \ 's|/usr/bin/freetype-config|${LOCALBASE}/bin/freetype-config|; \ @@ -40,9 +42,7 @@ post-patch: ${WRKSRC}/pypanelrc post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/deskutils/qlabels/Makefile ============================================================================== --- head/deskutils/qlabels/Makefile Thu Jul 3 21:48:44 2014 (r360463) +++ head/deskutils/qlabels/Makefile Thu Jul 3 21:54:14 2014 (r360464) @@ -24,6 +24,8 @@ DESKTOP_ENTRIES= "qLabels" \ "Office;Qt;" \ "true" +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} 's|/usr|${PREFIX}|g' \ ${WRKSRC}/qlabels.pro \ @@ -31,10 +33,8 @@ post-patch: ${WRKSRC}/lib/papers.cpp post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Changelog ${WRKSRC}/LICENSE \ ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407032154.s63LsEIX006215>