Date: Thu, 4 Jul 2013 14:22:41 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322276 - head/x11/fbpanel Message-ID: <201307041422.r64EMfDx025943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Thu Jul 4 14:22:41 2013 New Revision: 322276 URL: http://svnweb.freebsd.org/changeset/ports/322276 Log: x11/fbpanel: minor fixes - Remove unnecessary PORTDCOS from pkg-plist - Mute mkdir - Trim desktop entry and replace command PR: ports/180112 Submitted by: nemysis <nemysis@gmx.ch> (maintainer) Modified: head/x11/fbpanel/Makefile head/x11/fbpanel/pkg-plist Modified: head/x11/fbpanel/Makefile ============================================================================== --- head/x11/fbpanel/Makefile Thu Jul 4 14:20:37 2013 (r322275) +++ head/x11/fbpanel/Makefile Thu Jul 4 14:22:41 2013 (r322276) @@ -14,11 +14,11 @@ COMMENT= Lightweight, NETWM compliant X1 LICENSE= MIT USE_BZIP2= yes +USES= pkgconfig +USE_GNOME= gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_GMAKE= yes -USE_GNOME= gtk20 -USES= pkgconfig MAN1= ${PORTNAME}.1 @@ -27,28 +27,21 @@ PORTDOCS= CHANGELOG CREDITS NOTES README OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ - "${PORTNAME}" "System;" false + "${PORTNAME}" "${PORTNAME}" "System;" false .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -PLIST_SUB+= PORTDOCS="" -.else -PLIST_SUB+= PORTDOCS="@comment " -.endif - post-patch: - @${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/scripts/install.sh + @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh @${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \ ${WRKSRC}/data/man/${MAN1}.in post-install: - ${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1 ${LN} -sf ${DATADIR}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif Modified: head/x11/fbpanel/pkg-plist ============================================================================== --- head/x11/fbpanel/pkg-plist Thu Jul 4 14:20:37 2013 (r322275) +++ head/x11/fbpanel/pkg-plist Thu Jul 4 14:22:41 2013 (r322276) @@ -22,10 +22,6 @@ lib/fbpanel/tray.so lib/fbpanel/volume.so lib/fbpanel/wincmd.so libexec/fbpanel/make_profile -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/NOTES -%%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/default %%DATADIR%%/images/battery_0.png %%DATADIR%%/images/battery_1.png @@ -55,6 +51,5 @@ libexec/fbpanel/make_profile share/pixmaps/fbpanel.png @dirrm %%DATADIR%%/images @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/fbpanel @dirrm lib/fbpanel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041422.r64EMfDx025943>