mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Fix build for disabled NLS case

Browse Source 
- 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)
This commit is contained in:
Dmitry Marakasov 2016-05-26 16:29:44 +00:00
parent 01ca19a397
commit 3733b7bad2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=415903
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
x11/lxpanel/Makefile
View File

@ -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/alsa-lib
ALSA_CONFIGURE_ENABLE= alsa
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
.include <bsd.port.options.mk>
.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}

2
x11/lxpanel/pkg-plist
View File

@ -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