summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-05-28 16:14:27 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-05-28 16:14:27 +0000
commit341364114863507d4afde8069e2592f6806cdf74 (patch)
treea674fb2021268d0a28b657e4a3343244d1cb11dd /x11-wm
parentUpdate to the latest GNOME 2.0 snapshot, the "Stay on target!" release. (diff)
Update to 0.3.1.
Notes
Notes: svn path=/head/; revision=60203
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/metacity-setup/Makefile14
-rw-r--r--x11-wm/metacity-setup/distinfo2
-rw-r--r--x11-wm/metacity-setup/files/patch-src_callbacks.c13
3 files changed, 19 insertions, 10 deletions
diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index 861f8787a870..a33c97da3990 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -6,29 +6,25 @@
#
PORTNAME= metacity-setup
-PORTVERSION= 0.2
+PORTVERSION= 0.3.1
CATEGORIES= x11-wm
MASTER_SITES= http://plastercast.tzo.com/~plastercast/Projects/ \
http://www.marcuscom.com/downloads/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= marcus
-DISTNAME= Metacity-setup-${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
-WRKSRC= ${WRKDIR}/Metacity-setup
-
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
-AUTOMAKE_ARGS= --add-missing
USE_LIBTOOL= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
--datadir=${PREFIX}/share/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -37,8 +33,8 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-pre-configure:
- ${RM} -f ${WRKSRC}/install-sh ${WRKSRC}/COPYING ${WRKSRC}/INSTALL \
- ${WRKSRC}/mkinstalldirs ${WRKSRC}/missing
+post-patch:
+ @${PERL} -pi -e 's|\%\%X11BASE\%\%|${X11BASE}|g' \
+ ${WRKSRC}/src/callbacks.c
.include <bsd.port.mk>
diff --git a/x11-wm/metacity-setup/distinfo b/x11-wm/metacity-setup/distinfo
index d927101dffd2..fe33301595e7 100644
--- a/x11-wm/metacity-setup/distinfo
+++ b/x11-wm/metacity-setup/distinfo
@@ -1 +1 @@
-MD5 (Metacity-setup-0.2.tar.gz) = 44b376156595a0ef2ffd86372bc46041
+MD5 (metacity-setup-0.3.1.tar.gz) = 5d023fa26f7e0e92739ae53e1e614047
diff --git a/x11-wm/metacity-setup/files/patch-src_callbacks.c b/x11-wm/metacity-setup/files/patch-src_callbacks.c
new file mode 100644
index 000000000000..c1eae76366f0
--- /dev/null
+++ b/x11-wm/metacity-setup/files/patch-src_callbacks.c
@@ -0,0 +1,13 @@
+--- src/callbacks.c.orig Tue May 28 11:52:13 2002
++++ src/callbacks.c Tue May 28 11:53:24 2002
+@@ -30,9 +30,7 @@
+ gchar *possibleThemeDirs[4] =
+ { g_build_filename (g_get_home_dir (), ".metacity", "themes",
+ NULL),
+- "/gnome/head/INSTALL/share/metacity/themes",
+- "/usr/share/metacity/themes",
+- "/usr/local/share/metacity/themes"
++ "%%X11BASE%%/share/gnome/metacity/themes"
+ };
+ for (i = 0; i < 4; i++)
+ {