Date: Sat, 28 Dec 2013 18:01:27 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337889 - in branches/2014Q1/net-p2p/jigdo: . files Message-ID: <201312281801.rBSI1Roi088089@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sat Dec 28 18:01:26 2013 New Revision: 337889 URL: http://svnweb.freebsd.org/changeset/ports/337889 Log: MFH: r337742 - Fix build with clang - Fix build when GUI=on, needs pkgconfig to find GTK libs - Use options helpers, subs, modernize descriptions - Support staging Approved by: portmgr Added: branches/2014Q1/net-p2p/jigdo/files/ - copied from r337742, head/net-p2p/jigdo/files/ Modified: branches/2014Q1/net-p2p/jigdo/Makefile branches/2014Q1/net-p2p/jigdo/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-p2p/jigdo/Makefile ============================================================================== --- branches/2014Q1/net-p2p/jigdo/Makefile Sat Dec 28 17:59:47 2013 (r337888) +++ branches/2014Q1/net-p2p/jigdo/Makefile Sat Dec 28 18:01:26 2013 (r337889) @@ -12,8 +12,6 @@ COMMENT= Utility used to retrieve large RUN_DEPENDS= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget -MAN1= jigdo-file.1 jigdo-lite.1 jigdo-mirror.1 - USE_BZIP2= yes USE_SUBMAKE= yes GNU_CONFIGURE= yes @@ -23,44 +21,27 @@ WITH_BDB_VER?= 43 CPPFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= GUI BDB NLS -OPTIONS_DEFAULT= BDB NLS +OPTIONS_DEFAULT= BDB +OPTIONS_SUB= yes -GUI_DESC= Build the gtk2 gui -BDB_DESC= Build with Berkeley DB support (for jigdo-file cache) +GUI_DESC= GTK2 Graphical User Interface +BDB_DESC= Berkeley DB support (for jigdo-file cache) -NO_STAGE= yes -.include <bsd.port.options.mk> +GUI_CONFIGURE_WITH= gui +GUI_LIB_DEPENDS= libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \ + libcurl.so:${PORTSDIR}/ftp/curl +GUI_USES= pkgconfig + +BDB_CONFIGURE_ENV= LIBS=-L${BDB_LIB_DIR} +BDB_CONFIGURE_ON= --with-libdb=-l${BDB_LIB_CXX_NAME} +BDB_CONFIGURE_OFF= --without-libdb +BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} +BDB_USE= BDB=${WITH_BDB_VER} -.if ${PORT_OPTIONS:MGUI} -CONFIGURE_ARGS+= --with-gui -LIB_DEPENDS+= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ - curl:${PORTSDIR}/ftp/curl -MAN1+= jigdo.1 -PLIST_SUB+= GUI="" -.else -CONFIGURE_ARGS+=--without-gui -PLIST_SUB+= GUI="@comment " -.endif - -.if ${PORT_OPTIONS:MBDB} -CONFIGURE_ENV+= LIBS=-L${BDB_LIB_DIR} -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -CONFIGURE_ARGS+=--with-libdb=-l${BDB_LIB_CXX_NAME} -USE_BDB= ${WITH_BDB_VER} -.else -CONFIGURE_ARGS+=--without-libdb -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext post-install: - @${STRIP_CMD} ${PREFIX}/bin/jigdo-file + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jigdo-file .include <bsd.port.mk> Modified: branches/2014Q1/net-p2p/jigdo/pkg-plist ============================================================================== --- branches/2014Q1/net-p2p/jigdo/pkg-plist Sat Dec 28 17:59:47 2013 (r337888) +++ branches/2014Q1/net-p2p/jigdo/pkg-plist Sat Dec 28 18:01:26 2013 (r337889) @@ -1,8 +1,12 @@ bin/jigdo-file bin/jigdo-lite bin/jigdo-mirror +man/man1/jigdo-file.1.gz +man/man1/jigdo-lite.1.gz +man/man1/jigdo-mirror.1.gz share/jigdo/debian-mirrors.jigdo %%GUI%%bin/jigdo +%%GUI%%man/man1/jigdo.1.gz %%GUI%%share/jigdo/COPYING %%GUI%%share/jigdo/pixmaps/close.png %%GUI%%share/jigdo/pixmaps/jigdo-logo.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312281801.rBSI1Roi088089>