diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-14 12:17:20 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-14 12:17:20 +0800 |
| commit | b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202 (patch) | |
| tree | c65b185d100ed71d92c47fb7d8fc93a87d3526d0 /x11-wm | |
| parent | 242f45208404c4a62da94e84c137b719eadecde7 (diff) | |
| download | marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar.gz marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar.bz2 marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar.lz marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar.xz marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.tar.zst marcuscom-ports-b294f01a3c28e97b9ddf4d7d4faa5cb7f0715202.zip | |
Fix the build with the removal of objformat.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8557 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/metacity/Makefile | 6 | ||||
| -rw-r--r-- | x11-wm/metacity/files/patch-configure | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index c424a2482..b5852b473 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,7 +3,7 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.99 2007/02/27 18:03:41 mezz Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.100 2007/03/13 12:25:07 ahze Exp $ # PORTNAME= metacity @@ -23,8 +23,8 @@ USE_BZIP2= yes USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gconf2 +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-render CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure index 09c5caee7..9c810e0e2 100644 --- a/x11-wm/metacity/files/patch-configure +++ b/x11-wm/metacity/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 10 04:40:58 2005 -+++ configure Mon Jan 10 04:41:11 2005 -@@ -25377,7 +25377,6 @@ +--- configure.orig Tue Mar 13 23:11:45 2007 ++++ configure Tue Mar 13 23:13:04 2007 +@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; } if test x$have_xrender = xyes; then echo "Building with Render" @@ -8,3 +8,12 @@ fi fi ## have_composite +@@ -34431,7 +34430,7 @@ metacity-$VERSION: + " + + METACITY_MINOR_VERSION=18 +-if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then ++if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then + stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2)) + echo "This is the UNSTABLE branch of metacity" + echo -n "Use 2.$stable_version.x for stable " |