From owner-svn-ports-head@FreeBSD.ORG Sun Feb 9 20:10:03 2014 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 DA36592C; Sun, 9 Feb 2014 20:10:02 +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 B870E1286; Sun, 9 Feb 2014 20:10:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19KA2vr097611; Sun, 9 Feb 2014 20:10:02 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19KA2c3097607; Sun, 9 Feb 2014 20:10:02 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201402092010.s19KA2c3097607@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 9 Feb 2014 20:10:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343538 - head/x11-toolkits/gtk20 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: Sun, 09 Feb 2014 20:10:03 -0000 Author: danfe Date: Sun Feb 9 20:10:02 2014 New Revision: 343538 URL: http://svnweb.freebsd.org/changeset/ports/343538 QAT: https://qat.redports.org/buildarchive/r343538/ Log: Modernize and cleanup the port a bit: - Sort the USES and USE_* knobs; utilize these nifty OPTIONS helpers - Drop superfluous quotes, so the line fits in 80-char screen Approved by: silence from gnome@ (since Jan 21th) Modified: head/x11-toolkits/gtk20/Makefile head/x11-toolkits/gtk20/pkg-plist Modified: head/x11-toolkits/gtk20/Makefile ============================================================================== --- head/x11-toolkits/gtk20/Makefile Sun Feb 9 18:55:35 2014 (r343537) +++ head/x11-toolkits/gtk20/Makefile Sun Feb 9 20:10:02 2014 (r343538) @@ -27,11 +27,11 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/ma ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ python:${PORTSDIR}/lang/python -USE_LDCONFIG= yes +USES= gettext gmake pathfix perl5 pkgconfig GNU_CONFIGURE= yes USE_GNOME= atk pango gdkpixbuf2 introspection:build ltverhack \ gtk-update-icon-cache -USES= gettext gmake pathfix pkgconfig perl5 +USE_LDCONFIG= yes USE_PERL5= build USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite @@ -41,24 +41,17 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= CUPS DEBUG OPTIONS_DEFAULT=CUPS +OPTIONS_SUB= yes -.include +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_CONFIGURE_ON= --enable-cups=auto +CUPS_CONFIGURE_OFF= --disable-cups +DEBUG_CONFIGURE_ON= --enable-debug=yes -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -CONFIGURE_ARGS+=--enable-cups=auto -PLIST_SUB+= CUPS:="" -.else -CONFIGURE_ARGS+=--disable-cups -PLIST_SUB+= CUPS:="@comment " -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug=yes -.endif +.include post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure Modified: head/x11-toolkits/gtk20/pkg-plist ============================================================================== --- head/x11-toolkits/gtk20/pkg-plist Sun Feb 9 18:55:35 2014 (r343537) +++ head/x11-toolkits/gtk20/pkg-plist Sun Feb 9 20:10:02 2014 (r343538) @@ -288,8 +288,8 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/i lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so -%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la -%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so +%%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la +%%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la