summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-04-26 08:37:33 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-04-26 08:37:33 +0800
commit6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51 (patch)
treede5add4d753c8d85539dc7a03da53abd594316b6 /Mk
parent98b090dee7532b9214a25f802a0fd77acc4677b6 (diff)
downloadmarcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar.gz
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar.bz2
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar.lz
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar.xz
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.tar.zst
marcuscom-ports-6fa0e2b14dfc0c9e5e6f23b6da627b030db2ae51.zip
First step of share/gnome/ -> share/. This first step is going to break a lot
lot of ports. We will doing the steps by steps to fix ports by fix plist, remove hacks, make it works in runtime and etc. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8611 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnome.mk24
1 files changed, 3 insertions, 21 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index c580f3bbf..3f318ed5a 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.413 2007/02/27 04:39:18 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
#
# Please view me with 4 column tabs!
@@ -70,29 +70,13 @@ _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \
GNOME_MAKEFILEIN?= Makefile.in
SCROLLKEEPER_DIR= /var/db/scrollkeeper
gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
- s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
- s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
- s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
- s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
- s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
- s|[(]datadir[)]/gnome/|(datadir)/|g ; \
- s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
- s|[(]datadir[)]/mime"|(prefix)/share/mime"|g ; \
- s|[(]datadir[)]/mime;|(prefix)/share/mime;|g ; \
- s|[(]datadir[)]/mime$$|(prefix)/share/mime|g ; \
- s|[(]datadir[)]/dbus-1|(prefix)/share/dbus-1|g ; \
+ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
- s|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g ; \
- s|{datadir}/icons/hicolor|{prefix}/share/icons/hicolor|g ; \
s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
- s|{datadir}/locale|{prefix}/share/locale|g ; \
- s|DATADIR/dbus-1/services|prefix/share/dbus-1/services|g ; \
- s|datadir/dbus-1/services|prefix/share/dbus-1/services|g ; \
s|{libdir}/locale|{prefix}/share/locale|g'
referencehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -109,12 +93,10 @@ GNOME_HTML_DIR?= ${PREFIX}/share/doc
GCONF_CONFIG_OPTIONS?= merged
GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${TARGETDIR}/${GCONF_CONFIG_DIRECTORY}
-GNOME_LOCALSTATEDIR?= ${PREFIX}/share/gnome
+GNOME_LOCALSTATEDIR?= ${PREFIX}/share
gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
gnomeprefix_CONFIGURE_ARGS=--localstatedir=${DESTDIR}${GNOME_LOCALSTATEDIR} \
- --datadir=${TARGETDIR}/share/gnome \
--with-html-dir=${DESTDIR}${GNOME_HTML_DIR} \
- --with-help-dir=${TARGETDIR}/share/gnome/help \
--disable-gtk-doc \
--with-gconf-source=${GCONF_CONFIG_SOURCE} \
--mandir=${PREFIX}/man