From owner-svn-ports-head@FreeBSD.ORG Fri Dec 27 15:41:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBAAEC57; Fri, 27 Dec 2013 15:41:01 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7DFB1881; Fri, 27 Dec 2013 15:41:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRFf1iE096180; Fri, 27 Dec 2013 15:41:01 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRFf1he096177; Fri, 27 Dec 2013 15:41:01 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312271541.rBRFf1he096177@svn.freebsd.org> From: Pawel Pekala Date: Fri, 27 Dec 2013 15:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337742 - in head/net-p2p/jigdo: . files 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.17 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: Fri, 27 Dec 2013 15:41:02 -0000 Author: pawel Date: Fri Dec 27 15:41:00 2013 New Revision: 337742 URL: http://svnweb.freebsd.org/changeset/ports/337742 Log: - Fix build with clang - Fix build when GUI=on, needs pkgconfig to find GTK libs - Use options helpers, subs, modernize descriptions - Support staging Added: head/net-p2p/jigdo/files/ head/net-p2p/jigdo/files/patch-src__compat.hh (contents, props changed) Modified: head/net-p2p/jigdo/Makefile head/net-p2p/jigdo/pkg-plist (contents, props changed) Modified: head/net-p2p/jigdo/Makefile ============================================================================== --- head/net-p2p/jigdo/Makefile Fri Dec 27 15:28:28 2013 (r337741) +++ head/net-p2p/jigdo/Makefile Fri Dec 27 15:41:00 2013 (r337742) @@ -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 +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 Added: head/net-p2p/jigdo/files/patch-src__compat.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/jigdo/files/patch-src__compat.hh Fri Dec 27 15:41:00 2013 (r337742) @@ -0,0 +1,10 @@ +--- ./src/compat.hh.orig 2013-12-27 16:00:53.907143596 +0100 ++++ ./src/compat.hh 2013-12-27 16:01:15.205152700 +0100 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + #include Modified: head/net-p2p/jigdo/pkg-plist ============================================================================== --- head/net-p2p/jigdo/pkg-plist Fri Dec 27 15:28:28 2013 (r337741) +++ head/net-p2p/jigdo/pkg-plist Fri Dec 27 15:41:00 2013 (r337742) @@ -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