diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile index b08df8285cc..00606e6f6b8 100644 --- a/x11/gnome/applets2/Makefile +++ b/x11/gnome/applets2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2008/06/02 17:58:23 jasper Exp $ +# $OpenBSD: Makefile,v 1.44 2008/07/11 17:46:56 ajacoutot Exp $ COMMENT-main= applets for use with the GNOME panel COMMENT-battstat= GNOME applet for monitoring battery level @@ -6,8 +6,8 @@ COMMENT-battstat= GNOME applet for monitoring battery level GNOME_PROJECT= gnome-applets GNOME_VERSION= 2.20.0 -PKGNAME-main= gnome-applets2-${VERSION}p3 -PKGNAME-battstat= gnome-applets2-battstat-${VERSION}p4 +PKGNAME-main= gnome-applets2-${VERSION}p4 +PKGNAME-battstat= gnome-applets2-battstat-${VERSION}p5 SHARED_LIBS += gweather 0.0 # .0.0 CATEGORIES= x11 @@ -51,13 +51,6 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \ PSEUDO_FLAVORS= no_battstat FLAVOR?= -# We use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" \ - && ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "macppc" \ - && ${MACHINE_ARCH} != "sparc" -FLAVOR+= no_battstat -.endif - MULTI_PACKAGES= -main .if ${FLAVOR:L:Mno_battstat} CONFIGURE_ARGS+= --disable-battstat @@ -83,3 +76,11 @@ post-install: .include CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome" + +# not all powerpc support apm(4), hence the use of ${ARCH} and macppc +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" \ + && ${MACHINE_ARCH} != "i386" && ${ARCH} != "macppc" \ + && ${MACHINE_ARCH} != "sparc" +FLAVOR+= no_battstat +.endif + diff --git a/x11/gnome/applets2/pkg/PLIST-battstat b/x11/gnome/applets2/pkg/PLIST-battstat index a5635512a03..1e344e0def3 100644 --- a/x11/gnome/applets2/pkg/PLIST-battstat +++ b/x11/gnome/applets2/pkg/PLIST-battstat @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-battstat,v 1.14 2007/11/22 20:38:39 sturm Exp $ +@comment $OpenBSD: PLIST-battstat,v 1.15 2008/07/11 17:46:56 ajacoutot Exp $ lib/bonobo/servers/GNOME_BattstatApplet.server -libexec/battstat-applet-2 +@bin libexec/battstat-applet-2 share/examples/gnome-applets2/ share/examples/gnome-applets2/sound/ share/examples/gnome-applets2/sound/events/ diff --git a/x11/gnome/applets2/pkg/PLIST-main b/x11/gnome/applets2/pkg/PLIST-main index 3f147024898..c589ba8fbd1 100644 --- a/x11/gnome/applets2/pkg/PLIST-main +++ b/x11/gnome/applets2/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2007/11/22 20:38:39 sturm Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2008/07/11 17:46:56 ajacoutot Exp $ @pkgpath x11/gnome/applets2 @pkgpath x11/gnome/applets2,no_battstat %%SHARED%% @@ -6,8 +6,6 @@ include/libgweather/ include/libgweather/gweather-gconf.h include/libgweather/gweather-prefs.h include/libgweather/weather.h -lib/bonobo/ -lib/bonobo/servers/ lib/bonobo/servers/GNOME_AccessxStatusApplet.server lib/bonobo/servers/GNOME_CDPlayerApplet.server lib/bonobo/servers/GNOME_CharpickerApplet.server @@ -26,20 +24,17 @@ lib/bonobo/servers/GNOME_StickyNotesApplet.server lib/libgweather.a lib/libgweather.la lib/pkgconfig/gweather.pc -libexec/accessx-status-applet -libexec/charpick_applet2 -libexec/drivemount_applet2 -libexec/geyes_applet2 -libexec/gnome-keyboard-applet -libexec/gweather-applet-2 -libexec/mixer_applet2 -libexec/multiload-applet-2 -libexec/null_applet -libexec/stickynotes_applet -libexec/trashapplet -share/gnome/ -share/gnome-2.0/ -share/gnome-2.0/ui/ +@bin libexec/accessx-status-applet +@bin libexec/charpick_applet2 +@bin libexec/drivemount_applet2 +@bin libexec/geyes_applet2 +@bin libexec/gnome-keyboard-applet +@bin libexec/gweather-applet-2 +@bin libexec/mixer_applet2 +@bin libexec/multiload-applet-2 +@bin libexec/null_applet +@bin libexec/stickynotes_applet +@bin libexec/trashapplet share/gnome-2.0/ui/GNOME_AccessxApplet.xml share/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome-2.0/ui/GNOME_DriveMountApplet.xml @@ -83,7 +78,6 @@ share/gnome-applets/glade/trashapplet.glade share/gnome-applets/gweather/ share/gnome-applets/gweather/Locations.xml share/gnome-applets/gweather/locations.dtd -share/gnome/help/ share/gnome/help/accessx-status/ share/gnome/help/accessx-status/C/ share/gnome/help/accessx-status/C/accessx-status.xml @@ -857,71 +851,38 @@ share/gnome/help/trashapplet/uk/ share/gnome/help/trashapplet/uk/figures/ share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/gnome-eyes-applet.png share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png -share/icons/hicolor/22x22/ -share/icons/hicolor/22x22/apps/ share/icons/hicolor/22x22/apps/gnome-eyes-applet.png share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/gnome-eyes-applet.png share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/gnome-eyes-applet.png share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/ax-applet.png share/icons/hicolor/48x48/apps/charpick.png share/icons/hicolor/48x48/apps/gswitchit-applet.png share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png -share/icons/hicolor/scalable/ -share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/as/ -share/locale/as/LC_MESSAGES/ share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/be@latin/ -share/locale/be@latin/LC_MESSAGES/ share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/bn/ -share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/bn_IN/ -share/locale/bn_IN/LC_MESSAGES/ share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/bs/ -share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/cy/ -share/locale/cy/LC_MESSAGES/ share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/da/LC_MESSAGES/gnome-applets-2.0.mo share/locale/de/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/dz/ -share/locale/dz/LC_MESSAGES/ share/locale/dz/LC_MESSAGES/gnome-applets-2.0.mo share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/en_CA/ -share/locale/en_CA/LC_MESSAGES/ share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo share/locale/es_AR/ @@ -976,117 +937,61 @@ share/locale/es_VE/ share/locale/es_VE/LC_MESSAGES/ share/locale/es_VE/LC_MESSAGES/gnome-applets-2.0.mo share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/fa/ -share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/gu/ -share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/gnome-applets-2.0.mo share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/hi/ -share/locale/hi/LC_MESSAGES/ share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/hy/ -share/locale/hy/LC_MESSAGES/ share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/is/ -share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ka/ -share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ku/ -share/locale/ku/LC_MESSAGES/ share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ky/ -share/locale/ky/LC_MESSAGES/ share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mg/ -share/locale/mg/LC_MESSAGES/ share/locale/mg/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mk/ -share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ml/ -share/locale/ml/LC_MESSAGES/ share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mn/ -share/locale/mn/LC_MESSAGES/ share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/mr/ -share/locale/mr/LC_MESSAGES/ share/locale/mr/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ms/ -share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ne/ -share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/oc/ -share/locale/oc/LC_MESSAGES/ share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/or/ -share/locale/or/LC_MESSAGES/ share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ru/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/rw/ -share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/si/ -share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/sq/ -share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/ta/ -share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/te/ -share/locale/te/LC_MESSAGES/ share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/th/ -share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/wa/ -share/locale/wa/LC_MESSAGES/ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/xh/ -share/locale/xh/LC_MESSAGES/ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo @@ -1204,7 +1109,6 @@ share/omf/trashapplet/trashapplet-pa.omf share/omf/trashapplet/trashapplet-ru.omf share/omf/trashapplet/trashapplet-sv.omf share/omf/trashapplet/trashapplet-uk.omf -share/pixmaps/ share/pixmaps/accessx-status-applet/ share/pixmaps/accessx-status-applet/ax-applet.png share/pixmaps/accessx-status-applet/ax-bouncekeys.png @@ -1249,7 +1153,6 @@ share/pixmaps/stickynotes/resize_se.png share/pixmaps/stickynotes/resize_sw.png share/pixmaps/stickynotes/unlocked.png @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-applets2/*.schemas > /dev/null -share/schemas/ share/schemas/gnome-applets2/ share/schemas/gnome-applets2/charpick.schemas share/schemas/gnome-applets2/drivemount.schemas diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile index 84b88227ee8..ea6e11b09c0 100644 --- a/x11/icewm/Makefile +++ b/x11/icewm/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.34 2008/05/28 20:05:14 naddy Exp $ +# $OpenBSD: Makefile,v 1.35 2008/07/11 17:46:56 ajacoutot Exp $ COMMENT= small, fast window manager DISTNAME= icewm-1.2.35 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= x11 HOMEPAGE= http://www.icewm.org/ @@ -42,16 +42,16 @@ CONFIGURE_ARGS= --with-imlib=${PREFIX}/bin \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -# we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" \ - || ${MACHINE_ARCH} == "macppc" || ${MACHINE_ARCH} == "sparc" \ - || ${MACHINE_ARCH} == "amd64" -PATCH_LIST= patch-* apm-* -.endif - post-install: @perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:g;' \ -e 's:%%PREFIX%%:${TRUEPREFIX}:g;' \ ${PREFIX}/share/doc/icewm/icewm-7.html .include + +# not all powerpc support apm(4), hence the use of ${ARCH} and macppc +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" \ + || ${ARCH} == "macppc" || ${MACHINE_ARCH} == "sparc" \ + || ${MACHINE_ARCH} == "amd64" +PATCH_LIST= patch-* apm-* +.endif diff --git a/x11/icewm/pkg/PLIST b/x11/icewm/pkg/PLIST index 8eeddc95cbf..834c06929aa 100644 --- a/x11/icewm/pkg/PLIST +++ b/x11/icewm/pkg/PLIST @@ -1,11 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.12 2006/11/02 17:53:03 ajacoutot Exp $ -bin/icehelp -bin/icesh -bin/icewm -bin/icewm-session -bin/icewmbg -bin/icewmhint -bin/icewmtray +@comment $OpenBSD: PLIST,v 1.13 2008/07/11 17:46:56 ajacoutot Exp $ +@bin bin/icehelp +@bin bin/icesh +@bin bin/icewm +@bin bin/icewm-session +@bin bin/icewmbg +@bin bin/icewmhint +@bin bin/icewmtray share/doc/icewm/ share/doc/icewm/icewm-1.html share/doc/icewm/icewm-10.html diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile index 3623bbc9c66..c1f511721d0 100644 --- a/x11/matchbox/matchbox-panel/Makefile +++ b/x11/matchbox/matchbox-panel/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2008/04/30 04:22:55 sturm Exp $ +# $OpenBSD: Makefile,v 1.15 2008/07/11 17:46:56 ajacoutot Exp $ # XXX hardcoded apm list COMMENT= window bar for holding application launchers DISTNAME= matchbox-panel-0.9.3 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 MASTER_SITES= ${MASTER_SITES_MATCHBOX:=matchbox-panel/0.9/} @@ -24,9 +24,9 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" .include -# We use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed +# not all powerpc support apm(4), hence the use of ${ARCH} and macppc .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm" \ - || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "macppc" \ + || ${MACHINE_ARCH} == "i386" || ${ARCH} == "macppc" \ || ${MACHINE_ARCH} == "sparc" PKG_ARGS+=-DAPM=1 .else diff --git a/x11/matchbox/matchbox-panel/pkg/PFRAG.APM b/x11/matchbox/matchbox-panel/pkg/PFRAG.APM index 387e8e5937e..21880866665 100644 --- a/x11/matchbox/matchbox-panel/pkg/PFRAG.APM +++ b/x11/matchbox/matchbox-panel/pkg/PFRAG.APM @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.APM,v 1.1 2005/06/30 21:50:51 jolan Exp $ -bin/mb-applet-battery +@comment $OpenBSD: PFRAG.APM,v 1.2 2008/07/11 17:46:56 ajacoutot Exp $ +@bin bin/mb-applet-battery share/applications/mb-applet-battery.desktop diff --git a/x11/matchbox/matchbox-panel/pkg/PLIST b/x11/matchbox/matchbox-panel/pkg/PLIST index 4006f893c57..5480a968461 100644 --- a/x11/matchbox/matchbox-panel/pkg/PLIST +++ b/x11/matchbox/matchbox-panel/pkg/PLIST @@ -1,12 +1,11 @@ -@comment $OpenBSD: PLIST,v 1.4 2007/12/15 21:44:24 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.5 2008/07/11 17:46:56 ajacoutot Exp $ %%APM%% -bin/matchbox-panel -bin/mb-applet-clock -bin/mb-applet-launcher -bin/mb-applet-menu-launcher -@comment bin/mb-applet-system-monitor +@bin bin/matchbox-panel +@bin bin/mb-applet-clock +@bin bin/mb-applet-launcher +@bin bin/mb-applet-menu-launcher +@comment @bin bin/mb-applet-system-monitor @comment bin/mb-applet-xterm-wrapper.sh -share/applications/ share/applications/mb-applet-clock.desktop share/applications/mb-applet-menu-launcher.desktop @comment share/applications/mb-applet-system-monitor.desktop