Date: Fri, 4 Oct 2013 23:10:53 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329402 - in head: x11-fm/pcmanfm x11/libfm x11/lxde-meta x11/lxpanel x11/menu-cache x11/menu-cache/files Message-ID: <201310042310.r94NArJu053455@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Fri Oct 4 23:10:53 2013 New Revision: 329402 URL: http://svnweb.freebsd.org/changeset/ports/329402 Log: x11/menu-cache - Update to 0.5.0 - Change maintainer email to @FreeBSD.org - Remove not needed patches x11/lxde-meta - Bump PORTREVISION - Change maintainer email to @FreeBSD.org - Add dependency for deskutils/lxshortcut - Add NO_MTREE=yes x11/libfm - Bump PORTREVISION - Support STAGEDIR - Preserve original *.conf files with stage x11-fm/pcmanfm - Bump PORTREVISION - Support STAGEDIR - Preserve original *.conf files x11/lxpanel - Bump PORTREVISION Approved by: wg/pawel (mentors) Deleted: head/x11/menu-cache/files/ Modified: head/x11-fm/pcmanfm/Makefile head/x11-fm/pcmanfm/pkg-plist head/x11/libfm/Makefile head/x11/libfm/pkg-plist head/x11/lxde-meta/Makefile (contents, props changed) head/x11/lxpanel/Makefile (contents, props changed) head/x11/menu-cache/Makefile (contents, props changed) head/x11/menu-cache/distinfo (contents, props changed) head/x11/menu-cache/pkg-plist (contents, props changed) Modified: head/x11-fm/pcmanfm/Makefile ============================================================================== --- head/x11-fm/pcmanfm/Makefile Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11-fm/pcmanfm/Makefile Fri Oct 4 23:10:53 2013 (r329402) @@ -3,6 +3,7 @@ PORTNAME= pcmanfm PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ @@ -21,20 +22,23 @@ USE_FAM= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= pcmanfm.1 - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: + @${REINPLACE_CMD} -e '/pcmanfm.conf/ d' ${WRKSRC}/data/Makefile.in .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|src po|src|' \ ${WRKSRC}/Makefile.in .endif +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/pcmanfm/default/ + ${INSTALL_DATA} ${WRKSRC}/data/pcmanfm.conf \ + ${STAGEDIR}${PREFIX}/etc/xdg/pcmanfm/default/pcmanfm.conf.sample + .include <bsd.port.mk> Modified: head/x11-fm/pcmanfm/pkg-plist ============================================================================== --- head/x11-fm/pcmanfm/pkg-plist Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11-fm/pcmanfm/pkg-plist Fri Oct 4 23:10:53 2013 (r329402) @@ -1,5 +1,8 @@ bin/pcmanfm -etc/xdg/pcmanfm/default/pcmanfm.conf +@unexec if cmp -s %D/etc/xdg/pcmanfm/default/pcmanfm.conf %D/etc/xdg/pcmanfm/default/pcmanfm.conf.sample; then rm -f %D/etc/xdg/pcmanfm/default/pcmanfm.conf; fi +etc/xdg/pcmanfm/default/pcmanfm.conf.sample +@exec if [ ! -f %D/etc/xdg/pcmanfm/default/pcmanfm.conf ] ; then cp -p %D/%F %B/pcmanfm.conf; fi +man/man1/pcmanfm.1.gz share/applications/pcmanfm-desktop-pref.desktop share/applications/pcmanfm.desktop %%NLS%%share/locale/ar/LC_MESSAGES/pcmanfm.mo Modified: head/x11/libfm/Makefile ============================================================================== --- head/x11/libfm/Makefile Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/libfm/Makefile Fri Oct 4 23:10:53 2013 (r329402) @@ -3,6 +3,7 @@ PORTNAME= libfm PORTVERSION= 1.1.2.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/ @@ -25,14 +26,11 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= libfm-pref-apps.1 - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -52,11 +50,10 @@ pre-install: @(cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh) post-install: - @${MKDIR} ${PREFIX}/etc/xdg/libfm - ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf.sample - ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf.sample - @[ -f ${PREFIX}/etc/xdg/libfm/libfm.conf ] || \ - ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf - @[ -f ${PREFIX}/etc/xdg/libfm/pref-apps.conf ] || \ - ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/libfm + ${INSTALL_DATA} ${WRKSRC}/data/libfm.conf \ + ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample + ${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf \ + ${STAGEDIR}${PREFIX}/etc/xdg/libfm/pref-apps.conf.sample + .include <bsd.port.mk> Modified: head/x11/libfm/pkg-plist ============================================================================== --- head/x11/libfm/pkg-plist Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/libfm/pkg-plist Fri Oct 4 23:10:53 2013 (r329402) @@ -1,11 +1,11 @@ bin/libfm-pref-apps -include/libfm @unexec if cmp -s %D/etc/xdg/libfm/libfm.conf %D/etc/xdg/libfm/libfm.conf.sample; then rm -f %D/etc/xdg/libfm/libfm.conf; fi etc/xdg/libfm/libfm.conf.sample @exec if [ ! -f %D/etc/xdg/libfm/libfm.conf ] ; then cp -p %D/%F %B/libfm.conf; fi @unexec if cmp -s %D/etc/xdg/libfm/pref-apps.conf %D/etc/xdg/libfm/pref-apps.conf.sample; then rm -f %D/etc/xdg/libfm/pref-apps.conf; fi etc/xdg/libfm/pref-apps.conf.sample @exec if [ ! -f %D/etc/xdg/libfm/pref-apps.conf ] ; then cp -p %D/%F %B/pref-apps.conf; fi +include/libfm include/libfm-1.0/fm-actions.h include/libfm-1.0/fm-app-chooser-combo-box.h include/libfm-1.0/fm-app-chooser-dlg.h @@ -76,6 +76,7 @@ lib/libfm.so.4 libdata/pkgconfig/libfm-gtk.pc libdata/pkgconfig/libfm-gtk3.pc libdata/pkgconfig/libfm.pc +man/man1/libfm-pref-apps.1.gz share/applications/libfm-pref-apps.desktop %%DATADIR%%/archivers.list %%DATADIR%%/ui/app-chooser.ui @@ -143,8 +144,6 @@ share/applications/libfm-pref-apps.deskt %%NLS%%share/locale/zh_CN/LC_MESSAGES/libfm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libfm.mo share/mime/packages/libfm.xml -@dirrmtry etc/xdg/libfm -@dirrmtry etc/xdg @dirrmtry share/mime/packages @dirrmtry share/mime %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES @@ -157,3 +156,5 @@ share/mime/packages/libfm.xml @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm include/libfm-1.0 +@dirrmtry etc/xdg/libfm +@dirrmtry etc/xdg Modified: head/x11/lxde-meta/Makefile ============================================================================== --- head/x11/lxde-meta/Makefile Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/lxde-meta/Makefile Fri Oct 4 23:10:53 2013 (r329402) @@ -3,12 +3,12 @@ PORTNAME= lxde-meta PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= #none DISTFILES= #none -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= "meta-port" of the LXDE desktop slimmed down for FreeBSD releases RUN_DEPENDS= openbox:${PORTSDIR}/x11-wm/openbox \ @@ -18,6 +18,7 @@ RUN_DEPENDS= openbox:${PORTSDIR}/x11-wm/ lxinput:${PORTSDIR}/sysutils/lxinput \ lxtask:${PORTSDIR}/sysutils/lxtask \ lxterminal:${PORTSDIR}/sysutils/lxterminal \ + lxshortcut:${PORTSDIR}/deskutils/lxshortcut \ pcmanfm:${PORTSDIR}/x11-fm/pcmanfm \ gpicview:${PORTSDIR}/graphics/gpicview \ lxde-icon-theme>=0:${PORTSDIR}/x11-themes/lxde-icon-theme \ @@ -25,8 +26,9 @@ RUN_DEPENDS= openbox:${PORTSDIR}/x11-wm/ DESCR= ${.CURDIR}/pkg-descr -NO_WRKSUBDIR= YES -NO_BUILD= YES +NO_WRKSUBDIR= yes +NO_BUILD= yes +NO_MTREE= yes NO_STAGE= yes do-install: Modified: head/x11/lxpanel/Makefile ============================================================================== --- head/x11/lxpanel/Makefile Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/lxpanel/Makefile Fri Oct 4 23:10:53 2013 (r329402) @@ -3,6 +3,7 @@ PORTNAME= lxpanel PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}/ Modified: head/x11/menu-cache/Makefile ============================================================================== --- head/x11/menu-cache/Makefile Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/menu-cache/Makefile Fri Oct 4 23:10:53 2013 (r329402) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= menu-cache -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= x11 -MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/ +MASTER_SITES= SF/lxde/menu-cache/menu-cache%20${PORTVERSION:S/.0/.x/}/ -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= The menu-cache portion of LXDE USES= pkgconfig @@ -20,5 +19,4 @@ USE_FAM= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include <bsd.port.mk> Modified: head/x11/menu-cache/distinfo ============================================================================== --- head/x11/menu-cache/distinfo Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/menu-cache/distinfo Fri Oct 4 23:10:53 2013 (r329402) @@ -1,2 +1,2 @@ -SHA256 (menu-cache-0.4.1.tar.gz) = 4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e -SIZE (menu-cache-0.4.1.tar.gz) = 412859 +SHA256 (menu-cache-0.5.0.tar.gz) = 875a7441b34bb24debc1c8017d74d59987d7a704c4c023e81a0b4ebcc2d7904a +SIZE (menu-cache-0.5.0.tar.gz) = 406105 Modified: head/x11/menu-cache/pkg-plist ============================================================================== --- head/x11/menu-cache/pkg-plist Fri Oct 4 22:36:31 2013 (r329401) +++ head/x11/menu-cache/pkg-plist Fri Oct 4 23:10:53 2013 (r329402) @@ -2,8 +2,9 @@ include/menu-cache/menu-cache.h lib/libmenu-cache.a lib/libmenu-cache.la lib/libmenu-cache.so -lib/libmenu-cache.so.2 +lib/libmenu-cache.so.3 libdata/pkgconfig/libmenu-cache.pc -libexec/menu-cache-gen -libexec/menu-cached +libexec/menu-cache/menu-cache-gen +libexec/menu-cache/menu-cached +@dirrm libexec/menu-cache @dirrm include/menu-cache
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310042310.r94NArJu053455>