Date: Mon, 24 Mar 2014 22:14:07 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349075 - head/x11/wbar Message-ID: <201403242214.s2OME7QK024801@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Mar 24 22:14:06 2014 New Revision: 349075 URL: http://svnweb.freebsd.org/changeset/ports/349075 QAT: https://qat.redports.org/buildarchive/r349075/ Log: Support stage Remove useless desktopfileutils and intltools dependencies Use options helpers Modified: head/x11/wbar/Makefile head/x11/wbar/pkg-plist Modified: head/x11/wbar/Makefile ============================================================================== --- head/x11/wbar/Makefile Mon Mar 24 22:12:17 2014 (r349074) +++ head/x11/wbar/Makefile Mon Mar 24 22:14:06 2014 (r349075) @@ -9,58 +9,34 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} EXTRACT_SUFX= .tgz MAINTAINER= nivit@FreeBSD.org -COMMENT= A quick launch bar for fluxbox, WindowMaker, Xfce, etc +COMMENT= quick launch bar for fluxbox, WindowMaker, Xfce, etc LICENSE= GPLv3 CONFIGURE_ARGS= --exec-prefix=${PREFIX} -USES= pkgconfig +USES= pkgconfig gettext gmake +USE_EFL= imlib2 GNU_CONFIGURE= yes -MAN1= ${PORTNAME}.1 -MANLANG= "" es - OPTIONS_DEFINE= NLS WBARCONFIG OPTIONS_DEFAULT= NLS WBARCONFIG +OPTIONS_SUB= yes WBARCONFIG_DESC= Build the GTK+ configuration interface -NO_STAGE= yes -.include <bsd.port.options.mk> +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ENV= LIBS=-lintl -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls -CONFIGURE_ENV= LIBS=-lintl -PLIST_SUB= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -# The configure script has a couple of bugs... -post-patch: - ${REINPLACE_CMD} -e "s,install-data-@USE_NLS@,install-data-no,g" ${WRKSRC}/po/Makefile.in.in -.endif - -.if ${PORT_OPTIONS:MWBARCONFIG} -CONFIGURE_ARGS+= --enable-wbar-config -PLIST_SUB+= WBARCONFIG="" -MAN1+= ${PORTNAME}-config.1 -USE_GNOME= libglade2 -.else -CONFIGURE_ARGS+= --disable-wbar-config -PLIST_SUB+= WBARCONFIG="@comment " -.endif - -USE_EFL= imlib2 -USES+= gettext gmake -USE_GNOME+= desktopfileutils intltool +WBARCONFIG_CONFIGURE_ENABLE= wbar-config +WBARCONFIG_USE= GNOME=libglade2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_SUB+= DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} post-install: - ${MV} ${PREFIX}/etc/wbar.d/wbar.desktop ${DESKTOPDIR}/wbar.desktop + ${MV} ${STAGEDIR}${PREFIX}/etc/wbar.d/wbar.desktop ${STAGEDIR}${DESKTOPDIR}/wbar.desktop .include <bsd.port.mk> Modified: head/x11/wbar/pkg-plist ============================================================================== --- head/x11/wbar/pkg-plist Mon Mar 24 22:12:17 2014 (r349074) +++ head/x11/wbar/pkg-plist Mon Mar 24 22:14:06 2014 (r349075) @@ -2,6 +2,10 @@ bin/wbar %%WBARCONFIG%%bin/wbar-config etc/bash_completion.d/wbar etc/wbar.d/wbar.cfg +%%WBARCONFIG%%man/es/man1/wbar-config.1.gz +man/es/man1/wbar.1.gz +%%WBARCONFIG%%man/man1/wbar-config.1.gz +man/man1/wbar.1.gz %%DESKTOPDIR%%/wbar.desktop %%NLS%%share/locale/de/LC_MESSAGES/wbar.mo %%NLS%%share/locale/es/LC_MESSAGES/wbar.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403242214.s2OME7QK024801>