Remove the need for ${SYSCONFDIR}/gnome and use ${SYSCONFDIR} instead.

Discussed with landry@ and jasper@

ok jasper@
This commit is contained in:
ajacoutot 2011-01-18 20:03:07 +00:00
parent 58f02f2350
commit 7f3f4a8ea6
19 changed files with 60 additions and 74 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2010/12/05 18:24:33 jasper Exp $
# $OpenBSD: Makefile,v 1.21 2011/01/18 20:03:07 ajacoutot Exp $
MULTI_PACKAGES= -main -themes
@ -6,7 +6,7 @@ COMMENT-main= tetrinet client
COMMENT-themes= collection of gtetrinet themes
DISTNAME= gtetrinet-0.7.11
PKGNAME-main= ${DISTNAME}
REVISION-main= 11
REVISION-main= 12
PKGNAME-themes= gtetrinet-themes-20070623
REVISION-themes=1
CATEGORIES= x11 games
@ -78,15 +78,12 @@ NO_REGRESS= Yes
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/schemas/gtetrinet
@mv ${WRKINST}${SYSCONFDIR}/gnome/gconf/schemas/gtetrinet.schemas \
@mv ${WRKINST}${SYSCONFDIR}/gconf/schemas/gtetrinet.schemas \
${PREFIX}/share/schemas/gtetrinet
@rm -rf ${WRKINST}${SYSCONFDIR}/gnome
@rm -rf ${WRKINST}${SYSCONFDIR}/gconf
.for THEME in ${THEMES}
@tar xzf ${DISTDIR}/gtet-theme-${THEME}${EXTRACT_SUFX} -C \
${PREFIX}/share/gtetrinet/themes
.endfor
.include <bsd.port.mk>
# XXX for the schema to be in the right location
CONFIGURE_ARGS+=--sysconfdir=${SYSCONFDIR}/gnome

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.23 2011/01/16 20:34:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= reminder program for prevention of RSI
DISTNAME= workrave-1.9.3
CATEGORIES= productivity x11
REVISION= 0
HOMEPAGE= http://www.workrave.org/
# GPLv2
@ -61,5 +63,3 @@ post-install:
${PREFIX}/share/examples/workrave/sound/events
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,17 +1,16 @@
@comment $OpenBSD: PLIST,v 1.5 2011/01/16 20:34:40 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2011/01/18 20:03:07 ajacoutot Exp $
@bin bin/workrave
lib/bonobo/servers/Workrave-Applet.server
@bin libexec/workrave-applet
share/applications/workrave.desktop
share/dbus-1/services/org.workrave.Workrave.service
share/examples/workrave/
@sample ${SYSCONFDIR}/gnome/
share/examples/workrave/sound/
@sample ${SYSCONFDIR}/gnome/sound/
@sample ${SYSCONFDIR}/sound/
share/examples/workrave/sound/events/
@sample ${SYSCONFDIR}/gnome/sound/events/
@sample ${SYSCONFDIR}/sound/events/
share/examples/workrave/sound/events/workrave.soundlist
@sample ${SYSCONFDIR}/gnome/sound/events/workrave.soundlist
@sample ${SYSCONFDIR}/sound/events/workrave.soundlist
share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
share/locale/bg/LC_MESSAGES/workrave.mo
share/locale/ca/LC_MESSAGES/workrave.mo

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.103 2010/11/22 18:16:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.104 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT-main= applets for use with the GNOME panel
COMMENT-battstat= GNOME applet for monitoring battery level
@ -9,6 +9,9 @@ GNOME_VERSION= 2.32.1.1
PKGNAME-main= gnome-applets2-${VERSION}
PKGNAME-battstat= gnome-applets2-battstat-${VERSION}
REVISION-main= 0
REVISION-battstat= 0
CATEGORIES= x11
# LGPLv2/GFDLv1.1
@ -92,4 +95,3 @@ ENABLE_BATTSTAT=Yes
.if !defined(ENABLE_BATTSTAT)
CONFIGURE_ARGS+= --disable-battstat
.endif
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST-battstat,v 1.25 2010/09/30 07:33:16 ajacoutot Exp $
@comment $OpenBSD: PLIST-battstat,v 1.26 2011/01/18 20:03:07 ajacoutot Exp $
@bin libexec/battstat-applet-2
share/dbus-1/services/org.gnome.panel.applet.BattstatAppletFactory.service
share/examples/gnome-applets2/
@sample ${SYSCONFDIR}/gnome/
share/examples/gnome-applets2/sound/
@sample ${SYSCONFDIR}/gnome/sound/
@sample ${SYSCONFDIR}/sound/
share/examples/gnome-applets2/sound/events/
@sample ${SYSCONFDIR}/gnome/sound/events/
@sample ${SYSCONFDIR}/sound/events/
share/examples/gnome-applets2/sound/events/battstat_applet.soundlist
@sample ${SYSCONFDIR}/gnome/sound/events/battstat_applet.soundlist
@sample ${SYSCONFDIR}/sound/events/battstat_applet.soundlist
share/gnome-2.0/ui/battstat-applet-menu.xml
share/gnome-applets/builder/battstat_applet.ui
share/gnome-panel/applets/org.gnome.applets.BattstatApplet.panel-applet

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2010/11/22 08:36:57 espie Exp $
# $OpenBSD: Makefile,v 1.65 2011/01/18 20:03:07 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,6 +7,8 @@ COMMENT= components for the GNOME desktop
GNOME_PROJECT= gnome-desktop
GNOME_VERSION= 2.32.1
REVISION= 0
SHARED_LIBS += gnome-desktop-2 8.0 # .15.2
CATEGORIES= x11
@ -51,5 +53,3 @@ pre-configure:
-exec perl -pi -e 's,xsltproc,xsltproc --nonet,g' {} \;
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.42 2010/11/22 08:36:57 espie Exp $
# $OpenBSD: Makefile,v 1.43 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= API documentation browser for GNOME
GNOME_PROJECT= devhelp
GNOME_VERSION= 2.32.0
REVISION= 1
REVISION= 2
SHARED_LIBS += devhelp-2 0.0 # 1.0
@ -52,5 +52,3 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.45 2010/11/22 08:36:57 espie Exp $
# $OpenBSD: Makefile,v 1.46 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= GNOME component and compound document system
@ -8,6 +8,8 @@ GNOME_VERSION= 2.32.0
SHARED_LIBS += bonobo-activation 6.0 # .4.0
SHARED_LIBS += bonobo-2 2.0 # .0.0
REVISION= 0
CATEGORIES= devel
# GPLv2/LGPLv2.1
@ -44,5 +46,3 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/activation-server/bonobo-activation-server.1
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-activation-server_bonobo-activation-server_1,v 1.1 2008/12/20 15:24:35 ajacoutot Exp $
$OpenBSD: patch-activation-server_bonobo-activation-server_1,v 1.2 2011/01/18 20:03:07 ajacoutot Exp $
--- activation-server/bonobo-activation-server.1.orig Sat Dec 20 15:16:37 2008
+++ activation-server/bonobo-activation-server.1 Sat Dec 20 15:17:27 2008
@@ -7,7 +7,7 @@ bonobo-activation-server \- GNOME component tracker
@ -15,6 +15,6 @@ $OpenBSD: patch-activation-server_bonobo-activation-server_1,v 1.1 2008/12/20 15
variables to find .server files.
-In addition it examines an XML configuration file in ${prefix}/etc/bonobo-activation/bonobo-activation-config.xml
+In addition it examines an XML configuration file in ${SYSCONFDIR}/gnome/bonobo-activation/bonobo-activation-config.xml
+In addition it examines an XML configuration file in ${SYSCONFDIR}/bonobo-activation/bonobo-activation-config.xml
For more information see \fBhttp://www.gnome.org\fR.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.23 2010/09/30 07:41:43 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.24 2011/01/18 20:03:07 ajacoutot Exp $
%%SHARED%%
@bin bin/activation-client
@bin bin/bonobo-activation-run-query
@ -80,11 +80,10 @@ lib/pkgconfig/libbonobo-2.0.pc
@man man/man1/bonobo-activation-server.1
@bin sbin/bonobo-activation-sysconf
share/examples/libbonobo/
@sample ${SYSCONFDIR}/gnome/
share/examples/libbonobo/bonobo-activation/
@sample ${SYSCONFDIR}/gnome/bonobo-activation/
@sample ${SYSCONFDIR}/bonobo-activation/
share/examples/libbonobo/bonobo-activation/bonobo-activation-config.xml
@sample ${SYSCONFDIR}/gnome/bonobo-activation/bonobo-activation-config.xml
@sample ${SYSCONFDIR}/bonobo-activation/bonobo-activation-config.xml
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/bonobo-activation/

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.42 2010/11/22 08:36:57 espie Exp $
# $OpenBSD: Makefile,v 1.43 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= libraries for the GNOME project
GNOME_PROJECT= libgnome
GNOME_VERSION= 2.32.0
REVISION= 0
SHARED_LIBS += gnome-2 2402.0 # .3000.0
# LGPLv2
@ -39,5 +41,3 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/libgnome/
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2010/09/30 07:42:46 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2011/01/18 20:03:07 ajacoutot Exp $
%%SHARED%%
@bin bin/gnome-open
include/libgnome-2.0/
@ -29,15 +29,14 @@ lib/libgnome-2.la
lib/pkgconfig/libgnome-2.0.pc
@man man/man7/gnome-options.7
share/examples/libgnome/
@sample ${SYSCONFDIR}/gnome/
share/examples/libgnome/sound/
@sample ${SYSCONFDIR}/gnome/sound/
@sample ${SYSCONFDIR}/sound/
share/examples/libgnome/sound/events/
@sample ${SYSCONFDIR}/gnome/sound/events/
@sample ${SYSCONFDIR}/sound/events/
share/examples/libgnome/sound/events/gnome-2.soundlist
@sample ${SYSCONFDIR}/gnome/sound/events/gnome-2.soundlist
@sample ${SYSCONFDIR}/sound/events/gnome-2.soundlist
share/examples/libgnome/sound/events/gtk-events-2.soundlist
@sample ${SYSCONFDIR}/gnome/sound/events/gtk-events-2.soundlist
@sample ${SYSCONFDIR}/sound/events/gtk-events-2.soundlist
share/gnome-background-properties/
share/gnome-background-properties/gnome-default.xml
share/gtk-doc/html/libgnome/

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.41 2010/11/22 08:36:58 espie Exp $
# $OpenBSD: Makefile,v 1.42 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= GNOME media utilities
GNOME_PROJECT= gnome-media
GNOME_VERSION= 2.32.0
REVISION= 0
REVISION= 1
SHARED_LIBS += gnome-media-profiles 1.0 # .0.0
@ -46,5 +46,3 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.26 2010/10/19 15:21:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= MIME and Application database for GNOME
GNOME_PROJECT= gnome-mime-data
GNOME_VERSION= 2.18.0
CATEGORIES= x11
REVISION= 2
REVISION= 3
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -19,12 +19,11 @@ USE_LIBTOOL= No
CONFIGURE_STYLE= gnu old
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"
FAKE_FLAGS+= pkgconfigdir=${PREFIX}/lib/pkgconfig/
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-mime-data; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/gnome/* ${PREFIX}/share/examples/gnome-mime-data/
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-mime-data/
.include <bsd.port.mk>

View File

@ -1,12 +1,11 @@
@comment $OpenBSD: PLIST,v 1.11 2007/03/17 14:17:58 jasper Exp $
@comment $OpenBSD: PLIST,v 1.12 2011/01/18 20:03:07 ajacoutot Exp $
lib/pkgconfig/
lib/pkgconfig/gnome-mime-data-2.0.pc
share/application-registry/
share/application-registry/gnome-vfs.applications
share/examples/gnome-mime-data/
@sample ${SYSCONFDIR}/gnome/
share/examples/gnome-mime-data/gnome-vfs-mime-magic
@sample ${SYSCONFDIR}/gnome/gnome-vfs-mime-magic
@sample ${SYSCONFDIR}/gnome-vfs-mime-magic
share/locale/
share/locale/af/
share/locale/af/LC_MESSAGES/

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.78 2010/12/28 17:22:30 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.79 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= GNOME shell and file manager
@ -18,6 +18,8 @@ COMMENT= GNOME shell and file manager
GNOME_PROJECT= nautilus
GNOME_VERSION= 2.32.2.1
REVISION= 0
SHARED_LIBS += nautilus-extension 2.0 # .2.0
CATEGORIES= x11
@ -73,5 +75,3 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
REGRESS_IS_INTERACTIVE=x11
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2010/11/22 08:36:58 espie Exp $
# $OpenBSD: Makefile,v 1.38 2011/01/18 20:03:07 ajacoutot Exp $
COMMENT= project management application
GNOME_PROJECT= planner
GNOME_VERSION= 0.14.4
REVISION= 12
REVISION= 13
CATEGORIES= x11
@ -63,5 +63,3 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
USE_GROFF = Yes
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2010/11/22 08:36:58 espie Exp $
# $OpenBSD: Makefile,v 1.64 2011/01/18 20:03:07 ajacoutot Exp $
SHARED_ONLY= Yes
@ -9,6 +9,8 @@ GNOME_VERSION= 2.24.4
PKGNAME= gnome-vfs2-${VERSION}
REVISION= 0
SHARED_LIBS += gnomevfs-2 2400.0 # .2400.0
# GPLv2/LGPLv2
@ -52,5 +54,3 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/libgnomevfs/xdgmime.c
.include <bsd.port.mk>
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2010/09/30 07:40:37 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.20 2011/01/18 20:03:07 ajacoutot Exp $
@pkgpath x11/gnome/vfs2
@pkgpath x11/gnome/vfs2,-main
@pkgpath x11/gnome/vfs2,-smb
@ -113,15 +113,14 @@ lib/pkgconfig/gnome-vfs-module-2.0.pc
@bin libexec/gnome-vfs-daemon
share/dbus-1/services/gnome-vfs-daemon.service
share/examples/gnome-vfs2/
@sample ${SYSCONFDIR}/gnome/
share/examples/gnome-vfs2/gnome-vfs-2.0/
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/
@sample ${SYSCONFDIR}/gnome-vfs-2.0/
share/examples/gnome-vfs2/gnome-vfs-2.0/modules/
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/
@sample ${SYSCONFDIR}/gnome-vfs-2.0/modules/
share/examples/gnome-vfs2/gnome-vfs-2.0/modules/default-modules.conf
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/default-modules.conf
@sample ${SYSCONFDIR}/gnome-vfs-2.0/modules/default-modules.conf
share/examples/gnome-vfs2/gnome-vfs-2.0/modules/ssl-modules.conf
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/ssl-modules.conf
@sample ${SYSCONFDIR}/gnome-vfs-2.0/modules/ssl-modules.conf
share/gtk-doc/html/gnome-vfs-2.0/
share/gtk-doc/html/gnome-vfs-2.0/about.html
share/gtk-doc/html/gnome-vfs-2.0/data-types.html