From owner-svn-ports-head@FreeBSD.ORG Tue Jul 1 21:08:44 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 A1B1BB62; Tue, 1 Jul 2014 21:08:44 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75DB72EB1; Tue, 1 Jul 2014 21:08:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61L8iah000389; Tue, 1 Jul 2014 21:08:44 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61L8iVj000387; Tue, 1 Jul 2014 21:08:44 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407012108.s61L8iVj000387@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 1 Jul 2014 21:08:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360094 - in head/x11/guake: . 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.18 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: Tue, 01 Jul 2014 21:08:44 -0000 Author: tijl Date: Tue Jul 1 21:08:43 2014 New Revision: 360094 URL: http://svnweb.freebsd.org/changeset/ports/360094 QAT: https://qat.redports.org/buildarchive/r360094/ Log: - Fix problems with the location of the locale directory by setting CPPFLAGS and LIBS instead of using a patch - Use option helpers for NLS option - Add USES=libtool Deleted: head/x11/guake/files/patch-po__Makefile.in.in Modified: head/x11/guake/Makefile head/x11/guake/pkg-plist Modified: head/x11/guake/Makefile ============================================================================== --- head/x11/guake/Makefile Tue Jul 1 21:05:13 2014 (r360093) +++ head/x11/guake/Makefile Tue Jul 1 21:08:43 2014 (r360094) @@ -2,7 +2,7 @@ PORTNAME= guake PORTVERSION= 0.4.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://distfiles.gentoo.org/distfiles/ \ http://nivit.altervista.org/FreeBSD/ports/distfiles/ @@ -22,6 +22,9 @@ RUN_DEPENDS= py${PYTHON_SUFFIX}-dbus>=0. py${PYTHON_SUFFIX}-vte>=0.26.2_1:${PORTSDIR}/x11-toolkits/py-vte \ py${PYTHON_SUFFIX}-xdg>=0.19:${PORTSDIR}/devel/py-xdg +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib + #GH_ACCOUNT= Guake #GH_TAGNAME= ${PORTVERSION:R} #GH_COMMIT= 88af26c @@ -30,8 +33,8 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes -NLS_CONFIGURE_ON= --localedir=${PREFIX}/share/locale -NLS_CONFIGURE_OFF= --disable-nls +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext OPTIONS_DEFINE= MANPAGES NLS OPTIONS_DEFAULT= MANPAGES @@ -45,7 +48,7 @@ REINPLACE_FILES= guake guake-prefs prefs #USE_GITHUB= yes USE_GNOME= gtk20 pygnome2 USE_PYTHON= 2 -USES= desktop-file-utils gmake pkgconfig +USES= desktop-file-utils gmake libtool pkgconfig WRKSRC= ${WRKDIR}/${DISTNAME} @@ -55,11 +58,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME} MAKE_ENV+= man_MANS="" .endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -.else -REINPLACE_ARGS= -E -e 's,(USE_NLS=)yes,\1no,' -REINPLACE_FILES= ../configure +.if ! ${PORT_OPTIONS:MNLS} +REINPLACE_ARGS+= -e 's,\(USE_NLS=\)yes,\1no,' +REINPLACE_FILES+= ../configure .endif post-patch: Modified: head/x11/guake/pkg-plist ============================================================================== --- head/x11/guake/pkg-plist Tue Jul 1 21:05:13 2014 (r360093) +++ head/x11/guake/pkg-plist Tue Jul 1 21:08:43 2014 (r360094) @@ -24,7 +24,6 @@ bin/guake-prefs %%PYTHON_SITELIBDIR%%/guake/dbusiface.pyc %%PYTHON_SITELIBDIR%%/guake/dbusiface.pyo %%PYTHON_SITELIBDIR%%/guake/globalhotkeys.a -%%PYTHON_SITELIBDIR%%/guake/globalhotkeys.la %%PYTHON_SITELIBDIR%%/guake/globalhotkeys.so %%PYTHON_SITELIBDIR%%/guake/globals.py %%PYTHON_SITELIBDIR%%/guake/globals.pyc