Date: Wed, 25 Jun 2014 23:22:51 +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: r359316 - head/x11-wm/ede Message-ID: <201406252322.s5PNMpDw005323@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Wed Jun 25 23:22:51 2014 New Revision: 359316 URL: http://svnweb.freebsd.org/changeset/ports/359316 QAT: https://qat.redports.org/buildarchive/r359316/ Log: x11-wm/ede: update to 2.1 PR: 191378 Submitted by: tkato432 yahoo com Modified: head/x11-wm/ede/Makefile head/x11-wm/ede/distinfo head/x11-wm/ede/pkg-plist Modified: head/x11-wm/ede/Makefile ============================================================================== --- head/x11-wm/ede/Makefile Wed Jun 25 22:34:53 2014 (r359315) +++ head/x11-wm/ede/Makefile Wed Jun 25 23:22:51 2014 (r359316) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ede -PORTVERSION= 2.0 -PORTREVISION= 3 +PORTVERSION= 2.1 CATEGORIES= x11-wm MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib @@ -23,16 +22,18 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/de libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk -USES= fam iconv:translit gettext pathfix pkgconfig \ +USES= fam gettext iconv:translit pathfix pkgconfig \ shared-mime-info shebangfix SHEBANG_FILES= doc/asciidoc/asciidoc.py python_OLD_CMD= ${SETENV} python python_CMD= ${PYTHON_CMD} USE_XORG= xcomposite xft xinerama xpm xrandr USE_PYTHON= 2 +USE_CSTD= gnu89 GNU_CONFIGURE= yes -CONFIGURE_ENV= PEKWM_CXXFLAGS="${CXXFLAGS}" -CONFIGURE_ARGS= --with-edelib_path=${EDELIB_WRKSRC} \ +CONFIGURE_ENV= PEKWM_CXXFLAGS="${CXXFLAGS}" \ + PKG_CONFIG_PATH="${EDELIB_WRKSRC}/pc" +CONFIGURE_ARGS= --with-edelib-path=${EDELIB_WRKSRC} \ --with-fltk-path=${LOCALBASE} INSTALL_ICONS= yes MAKE_JOBS_UNSAFE= yes @@ -55,16 +56,27 @@ EDELIB_WRKSRC= ${WRKDIR}/${EDELIB_DISTNA post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/local/share|${LOCALBASE}/share| ; \ + '/DEVELOPER_FLAGS=/s|-pedantic|| ; \ /OPTIM_FLAGS=/s|-O2|-fPIC| ; \ - s|_daylight=yes|_daylight=no|' ${EDELIB_WRKSRC}/configure + s|_daylight=yes|_daylight=no| ; \ + s|/usr/local/share|${LOCALBASE}/share|' \ + ${EDELIB_WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|$$(CC)|@CXX@| ; \ + /-lstdc++/s|^|#|' ${EDELIB_WRKSRC}/Jamconfig.in @${REINPLACE_CMD} -e \ 's| -liconv| ${ICONV_LIB}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|$$(CC)|@CXX@| ; \ - s|-lstdc++||' ${WRKSRC}/Jamconfig.in + /panel-applets/s|EDE_DATA_DIR|libdir| ; \ + /-lstdc++/s|^|#|' ${WRKSRC}/Jamconfig.in + @${REINPLACE_CMD} -e \ + '/desktop-links/s|^|#|' ${WRKSRC}/data/Jamfile @${REINPLACE_CMD} -e \ - '/desktop-links/s|^|#|' ${WRKSRC}/data/Jamfile + '/-ldl/s|^|#|' ${WRKSRC}/ede-panel/Jamfile + @${REINPLACE_CMD} -e \ + 's|"\(panel-applets\)"|"../../lib/ede/\1"|' \ + ${WRKSRC}/ede-panel/Panel.cpp pre-configure: @(cd ${EDELIB_WRKSRC} \ @@ -87,16 +99,20 @@ do-build: do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" \ ${LOCALBASE}/bin/jam ${INSTALL_TARGET}) - @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ede-2.1.0/manual/images @(cd ${WRKSRC}/doc/manual/images && ${COPYTREE_SHARE} . \ - ${STAGEDIR}${PREFIX}/share/doc/ede-2.0.0/manual/images) + ${STAGEDIR}${PREFIX}/share/doc/ede-2.1.0/manual/images) .for i in ede-about ede-autostart ede-bell-conf ede-bug-report ede-crasher \ ede-calc ede-conf ede-desktop ede-desktop-conf ede-dialog \ ede-keyboard-conf ede-notify-daemon ede-screensaver-conf \ - ede-image-view ede-launch emountd ede-timedate ede-tip \ - ede-tip-compiler ede-preferred-applications evoke ede-shutdown \ - ede-panel ede-menu-spec-test pekwm + ede-image-view ede-launch ede-timedate ede-tip ede-tip-compiler \ + ede-preferred-applications evoke ede-shutdown ede-panel pekwm @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor +.for i in battery_monitor.so clock.so cpu_monitor.so keyboard_layout.so \ + mem_monitor.so pager.so quick_launch.so start_menu.so \ + system_tray.so taskbar.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ede/panel-applets/${i} +.endfor .include <bsd.port.mk> Modified: head/x11-wm/ede/distinfo ============================================================================== --- head/x11-wm/ede/distinfo Wed Jun 25 22:34:53 2014 (r359315) +++ head/x11-wm/ede/distinfo Wed Jun 25 23:22:51 2014 (r359316) @@ -1,4 +1,4 @@ -SHA256 (ede-2.0.tar.gz) = c788b101881a9640ca09febd0202b4ceef0e9e9ba2a0a590ac04cde46a6ed71a -SIZE (ede-2.0.tar.gz) = 12839115 -SHA256 (edelib-2.0.tar.gz) = c31bc7e5156424fa7e2fe3e671e7d7d876cbe55f035029ac8569bfc946fc84ae -SIZE (edelib-2.0.tar.gz) = 759985 +SHA256 (ede-2.1.tar.gz) = 3361af07d17f79bd0d12daf34059c9e6449ddf23a8843f2b6e17268a80298a0e +SIZE (ede-2.1.tar.gz) = 12854852 +SHA256 (edelib-2.1.tar.gz) = 38030d964affece5363edaf8e8f1ac2441f1a860472537a0501f6844e383f35c +SIZE (edelib-2.1.tar.gz) = 1054649 Modified: head/x11-wm/ede/pkg-plist ============================================================================== --- head/x11-wm/ede/pkg-plist Wed Jun 25 22:34:53 2014 (r359315) +++ head/x11-wm/ede/pkg-plist Wed Jun 25 23:22:51 2014 (r359316) @@ -12,7 +12,6 @@ bin/ede-help bin/ede-image-view bin/ede-keyboard-conf bin/ede-launch -bin/ede-menu-spec-test bin/ede-notify-daemon bin/ede-panel bin/ede-preferred-applications @@ -23,7 +22,6 @@ bin/ede-shutdown bin/ede-timedate bin/ede-tip bin/ede-tip-compiler -bin/emountd bin/evoke bin/pekwm bin/startede @@ -39,6 +37,16 @@ etc/xdg/ede/ede-conf.conf etc/xdg/ede/ede-settings.conf etc/xdg/ede/ede-startup.conf etc/xdg/menus/ede-applications.menu +lib/ede/panel-applets/battery_monitor.so +lib/ede/panel-applets/clock.so +lib/ede/panel-applets/cpu_monitor.so +lib/ede/panel-applets/keyboard_layout.so +lib/ede/panel-applets/mem_monitor.so +lib/ede/panel-applets/pager.so +lib/ede/panel-applets/quick_launch.so +lib/ede/panel-applets/start_menu.so +lib/ede/panel-applets/system_tray.so +lib/ede/panel-applets/taskbar.so share/applications/ede-about.desktop share/applications/ede-calc.desktop share/applications/ede-conf.desktop @@ -61,56 +69,45 @@ share/desktop-directories/ede-office.dir share/desktop-directories/ede-other.directory share/desktop-directories/ede-settings.directory share/desktop-directories/ede-system.directory -share/doc/ede-2.0.0/manual/README.html -share/doc/ede-2.0.0/manual/dbus-usage.html -share/doc/ede-2.0.0/manual/ede-calc.html -share/doc/ede-2.0.0/manual/ede-dialog.html -share/doc/ede-2.0.0/manual/ede-help.html -share/doc/ede-2.0.0/manual/ede-notify-daemon.html -share/doc/ede-2.0.0/manual/ede-tip.html -share/doc/ede-2.0.0/manual/emountd.html -share/doc/ede-2.0.0/manual/evoke.html -share/doc/ede-2.0.0/manual/hacking.html -share/doc/ede-2.0.0/manual/images/README -share/doc/ede-2.0.0/manual/images/callouts/1.png -share/doc/ede-2.0.0/manual/images/callouts/10.png -share/doc/ede-2.0.0/manual/images/callouts/11.png -share/doc/ede-2.0.0/manual/images/callouts/12.png -share/doc/ede-2.0.0/manual/images/callouts/13.png -share/doc/ede-2.0.0/manual/images/callouts/14.png -share/doc/ede-2.0.0/manual/images/callouts/15.png -share/doc/ede-2.0.0/manual/images/callouts/2.png -share/doc/ede-2.0.0/manual/images/callouts/3.png -share/doc/ede-2.0.0/manual/images/callouts/4.png -share/doc/ede-2.0.0/manual/images/callouts/5.png -share/doc/ede-2.0.0/manual/images/callouts/6.png -share/doc/ede-2.0.0/manual/images/callouts/7.png -share/doc/ede-2.0.0/manual/images/callouts/8.png -share/doc/ede-2.0.0/manual/images/callouts/9.png -share/doc/ede-2.0.0/manual/images/caution.png -share/doc/ede-2.0.0/manual/images/ede-calc.jpg -share/doc/ede-2.0.0/manual/images/ede-tip.jpg -share/doc/ede-2.0.0/manual/images/example.png -share/doc/ede-2.0.0/manual/images/home.png -share/doc/ede-2.0.0/manual/images/important.png -share/doc/ede-2.0.0/manual/images/next.png -share/doc/ede-2.0.0/manual/images/note.png -share/doc/ede-2.0.0/manual/images/prev.png -share/doc/ede-2.0.0/manual/images/tip.png -share/doc/ede-2.0.0/manual/images/up.png -share/doc/ede-2.0.0/manual/images/warning.png -share/doc/ede-2.0.0/manual/index.html -share/doc/ede-2.0.0/manual/introduction.html -%%DATADIR%%/panel-applets/clock.so -%%DATADIR%%/panel-applets/cpu_monitor.so -%%DATADIR%%/panel-applets/hider.so -%%DATADIR%%/panel-applets/keyboard_layout.so -%%DATADIR%%/panel-applets/mem_monitor.so -%%DATADIR%%/panel-applets/pager.so -%%DATADIR%%/panel-applets/quick_launch.so -%%DATADIR%%/panel-applets/start_menu.so -%%DATADIR%%/panel-applets/system_tray.so -%%DATADIR%%/panel-applets/taskbar.so +share/doc/ede-2.1.0/manual/README.html +share/doc/ede-2.1.0/manual/dbus-usage.html +share/doc/ede-2.1.0/manual/ede-calc.html +share/doc/ede-2.1.0/manual/ede-dialog.html +share/doc/ede-2.1.0/manual/ede-help.html +share/doc/ede-2.1.0/manual/ede-notify-daemon.html +share/doc/ede-2.1.0/manual/ede-tip.html +share/doc/ede-2.1.0/manual/evoke.html +share/doc/ede-2.1.0/manual/hacking.html +share/doc/ede-2.1.0/manual/images/README +share/doc/ede-2.1.0/manual/images/callouts/1.png +share/doc/ede-2.1.0/manual/images/callouts/10.png +share/doc/ede-2.1.0/manual/images/callouts/11.png +share/doc/ede-2.1.0/manual/images/callouts/12.png +share/doc/ede-2.1.0/manual/images/callouts/13.png +share/doc/ede-2.1.0/manual/images/callouts/14.png +share/doc/ede-2.1.0/manual/images/callouts/15.png +share/doc/ede-2.1.0/manual/images/callouts/2.png +share/doc/ede-2.1.0/manual/images/callouts/3.png +share/doc/ede-2.1.0/manual/images/callouts/4.png +share/doc/ede-2.1.0/manual/images/callouts/5.png +share/doc/ede-2.1.0/manual/images/callouts/6.png +share/doc/ede-2.1.0/manual/images/callouts/7.png +share/doc/ede-2.1.0/manual/images/callouts/8.png +share/doc/ede-2.1.0/manual/images/callouts/9.png +share/doc/ede-2.1.0/manual/images/caution.png +share/doc/ede-2.1.0/manual/images/ede-calc.jpg +share/doc/ede-2.1.0/manual/images/ede-tip.jpg +share/doc/ede-2.1.0/manual/images/example.png +share/doc/ede-2.1.0/manual/images/home.png +share/doc/ede-2.1.0/manual/images/important.png +share/doc/ede-2.1.0/manual/images/next.png +share/doc/ede-2.1.0/manual/images/note.png +share/doc/ede-2.1.0/manual/images/prev.png +share/doc/ede-2.1.0/manual/images/tip.png +share/doc/ede-2.1.0/manual/images/up.png +share/doc/ede-2.1.0/manual/images/warning.png +share/doc/ede-2.1.0/manual/index.html +share/doc/ede-2.1.0/manual/introduction.html %%DATADIR%%/themes/splash-themes/scape/autostart.png %%DATADIR%%/themes/splash-themes/scape/background.png %%DATADIR%%/themes/splash-themes/scape/ede-desktop.png @@ -1544,13 +1541,14 @@ share/xsessions/ede.desktop @dirrm %%DATADIR%%/themes/splash-themes/scape @dirrm %%DATADIR%%/themes/splash-themes @dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%%/panel-applets +@dirrm lib/ede/panel-applets @dirrm %%DATADIR%% -@dirrm share/doc/ede-2.0.0/manual/images/callouts -@dirrm share/doc/ede-2.0.0/manual/images -@dirrm share/doc/ede-2.0.0/manual -@dirrm share/doc/ede-2.0.0 +@dirrm share/doc/ede-2.1.0/manual/images/callouts +@dirrm share/doc/ede-2.1.0/manual/images +@dirrm share/doc/ede-2.1.0/manual +@dirrm share/doc/ede-2.1.0 @dirrmtry share/desktop-directories +@dirrm lib/ede @dirrmtry etc/xdg/menus @dirrm etc/xdg/ede @dirrmtry etc/xdg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406252322.s5PNMpDw005323>