Date: Tue, 1 Jul 2014 21:08:44 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360094 - in head/x11/guake: . files Message-ID: <201407012108.s61L8iVj000387@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407012108.s61L8iVj000387>