From owner-svn-ports-head@freebsd.org Thu May 26 16:29:46 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04B83B4B8F5; Thu, 26 May 2016 16:29:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B17E21E71; Thu, 26 May 2016 16:29:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QGTicD018829; Thu, 26 May 2016 16:29:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QGTi0R018827; Thu, 26 May 2016 16:29:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201605261629.u4QGTi0R018827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 26 May 2016 16:29:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415903 - head/x11/lxpanel 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.22 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: Thu, 26 May 2016 16:29:46 -0000 Author: amdmi3 Date: Thu May 26 16:29:44 2016 New Revision: 415903 URL: https://svnweb.freebsd.org/changeset/ports/415903 Log: - Fix build for disabled NLS case - Switch to options helpers - Simplify stripping - Simplify plist handling PR: 202076 Reported by: sascha@root-login.org Approved by: maintainer timeout (horia@racoviceanu.com, 9 months) Modified: head/x11/lxpanel/Makefile head/x11/lxpanel/pkg-plist Modified: head/x11/lxpanel/Makefile ============================================================================== --- head/x11/lxpanel/Makefile Thu May 26 16:25:39 2016 (r415902) +++ head/x11/lxpanel/Makefile Thu May 26 16:29:44 2016 (r415903) @@ -26,7 +26,7 @@ USES= gmake pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" \ --with-plugins=netstatus,volume,volumealsa,deskno,batt,kbled,xkb,thermal,cpu,cpufreq,monitors,wnckpager \ - --with-x \ + --with-x --disable-silent-rules \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -I${WRKSRC} @@ -41,14 +41,7 @@ ALSA_LIB_DEPENDS= libasound.so:audio/als ALSA_CONFIGURE_ENABLE= alsa NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext - -.include - -.if ${PORT_OPTIONS:MALSA} -PLIST_SUB+= VOLUME="@comment " -.else -PLIST_SUB+= VOLUME="" -.endif +NLS_USES_OFF= gettext-tools post-patch: @${REINPLACE_CMD} -e '/g_thread_create/ \ @@ -105,22 +98,14 @@ post-patch: @${REINPLACE_CMD} -e 's|linux|sys|' \ ${WRKSRC}/src/plugins/volume/volume-impl.c -.if ! ${PORT_OPTIONS:MNLS} +post-patch-NLS-off: @${REINPLACE_CMD} -e 's|po man|man|' \ ${WRKSRC}/Makefile.in -.endif post-install: -.for l in netstatus deskno batt kbled xkb thermal cpu cpufreq monitors wnckpager - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/${l}.so -.endfor - -.if ${PORT_OPTIONS:MALSA} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volumealsa.so -.else - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/volume.so -.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxpanel/plugins/*.so +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/x11/lxpanel/pkg-plist ============================================================================== --- head/x11/lxpanel/pkg-plist Thu May 26 16:25:39 2016 (r415902) +++ head/x11/lxpanel/pkg-plist Thu May 26 16:29:44 2016 (r415903) @@ -9,7 +9,7 @@ lib/lxpanel/plugins/kbled.so lib/lxpanel/plugins/monitors.so lib/lxpanel/plugins/netstatus.so lib/lxpanel/plugins/thermal.so -%%VOLUME%%lib/lxpanel/plugins/volume.so +%%NO_ALSA%%lib/lxpanel/plugins/volume.so %%ALSA%%lib/lxpanel/plugins/volumealsa.so lib/lxpanel/plugins/xkb.so lib/lxpanel/plugins/wnckpager.so