diff options
| author | wennmach <wennmach> | 2005-06-20 10:58:16 +0000 |
|---|---|---|
| committer | wennmach <wennmach> | 2005-06-20 10:58:16 +0000 |
| commit | 0f99329fa3a2f6ae8adcf1fc20bd3b374d61e29e (patch) | |
| tree | cf060d76e3a2a5c1e614830466d9ccde8326167f /x11 | |
| parent | a435384469b8ee26355a0908769919852feb6006 (diff) | |
| download | pkgsrc-0f99329fa3a2f6ae8adcf1fc20bd3b374d61e29e.tar.gz | |
Make xworld work with USE_X11=xorg
Patches provided by Antoine Reilles in PR pkg/30376
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xworld/Makefile | 10 | ||||
| -rw-r--r-- | x11/xworld/distinfo | 4 | ||||
| -rw-r--r-- | x11/xworld/patches/patch-ac | 14 |
3 files changed, 18 insertions, 10 deletions
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 8553120e700..560acfaa138 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:33 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/20 10:58:16 wennmach Exp $ # DISTNAME= xworld-2.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://gutemine.geo.uni-koeln.de/pub/xworld/ \ ftp://ftp.Uni-Koeln.DE/misc/ @@ -16,6 +16,12 @@ CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" CONFIGURE_ENV+= CAT="${CAT}" STRIP=strip INCLUDES="" MORELIBS="" +SUBST_CLASSES+= x11 +SUBST_MESSAGE.x11= "Fixing x11 options." +SUBST_STAGE.x11= post-patch +SUBST_FILES.x11= defaults/NetBSD/set.csh +SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g' + SUBST_CLASSES+= install SUBST_MESSAGE.install= "Fixing install options." SUBST_STAGE.install= post-patch diff --git a/x11/xworld/distinfo b/x11/xworld/distinfo index 030ffe256cb..d1c0f4b4169 100644 --- a/x11/xworld/distinfo +++ b/x11/xworld/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:36:26 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/06/20 10:58:16 wennmach Exp $ SHA1 (xworld-2.0.tar.gz) = 99217a8f0b63ef8685c5508fbbff4f5d7bb9b9a8 RMD160 (xworld-2.0.tar.gz) = b139357f529a8df535f82fecd74319b0f82605b3 Size (xworld-2.0.tar.gz) = 113385 bytes SHA1 (patch-aa) = 197faebefac19a2457c0201ca35eb3a2f333c51a SHA1 (patch-ab) = 60d1591c3c155e9fbf6bac094b20cd6a6df73df0 -SHA1 (patch-ac) = f008b4140f3f27be2c6a05a3ece2c74f0a3e2899 +SHA1 (patch-ac) = 6907ce3a08c8c8ab3689d7c1956e5d86f6265fbf SHA1 (patch-ad) = d243d16ef9d79e82c817ae116b3a9b9cba71a1eb SHA1 (patch-ae) = 5abdb1a4a6133fee1f5d3a83625a41c27e07c912 SHA1 (patch-af) = cf41e600032bea1c3b2cbd5436160b412fad7010 diff --git a/x11/xworld/patches/patch-ac b/x11/xworld/patches/patch-ac index 5240c5fbd75..ba1e22e294f 100644 --- a/x11/xworld/patches/patch-ac +++ b/x11/xworld/patches/patch-ac @@ -1,11 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2000/08/17 15:26:32 fredb Exp $ +$NetBSD: patch-ac,v 1.2 2005/06/20 10:58:17 wennmach Exp $ ---- defaults/NetBSD/set.csh.orig Wed Jul 28 10:13:06 1999 -+++ defaults/NetBSD/set.csh Thu Aug 17 10:17:24 2000 -@@ -4,5 +4,5 @@ +--- defaults/NetBSD/set.csh.orig 1999-07-28 17:13:06.000000000 +0200 ++++ defaults/NetBSD/set.csh 2005-05-30 15:00:52.000000000 +0200 +@@ -3,6 +3,6 @@ + set CFLAGS = "-O2 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wformat" set INSTALL = "/usr/bin/install -c" set STRIP = "/usr/bin/strip" - set INCLUDES = "-I/usr/X11R6/include" +-set INCLUDES = "-I/usr/X11R6/include" -set LDLIBS = "-lm -L/usr/X11R6/lib -lX11" -+set LDLIBS = "-lm -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11" ++set INCLUDES = "-I@X11BASE@/include" ++set LDLIBS = "-lm -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -lX11" set MORELIBS = " " |