diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-10-24 10:10:21 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-10-24 10:10:21 +0000 |
| commit | 3a5f618095eb94b9c691452c706594ec33e8a768 (patch) | |
| tree | 09cd6e2038267502c91bdbd5e80e9cf6975447e4 | |
| parent | 9e4aa262acc1887219214135fe358a189b844cd8 (diff) | |
| download | pkgsrc-3a5f618095eb94b9c691452c706594ec33e8a768.tar.gz | |
Fix build on SunOS. Initial patch from Thomas Merkel.
| -rw-r--r-- | x11/xworld/Makefile | 3 | ||||
| -rw-r--r-- | x11/xworld/distinfo | 3 | ||||
| -rw-r--r-- | x11/xworld/patches/patch-defaults_Solaris_set.csh | 21 |
3 files changed, 25 insertions, 2 deletions
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index acc81039f56..2a59fc752f5 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/29 05:07:25 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/10/24 10:10:21 jperkin Exp $ # DISTNAME= xworld-2.0 @@ -21,6 +21,7 @@ SUBST_CLASSES+= x11 SUBST_MESSAGE.x11= Fixing x11 options. SUBST_STAGE.x11= pre-configure SUBST_FILES.x11= defaults/NetBSD/set.csh +SUBST_FILES.x11+= defaults/Solaris/set.csh SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g' .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/xworld/distinfo b/x11/xworld/distinfo index 10fa8129f76..3818a20af90 100644 --- a/x11/xworld/distinfo +++ b/x11/xworld/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2012/07/30 04:23:23 dholland Exp $ +$NetBSD: distinfo,v 1.11 2013/10/24 10:10:21 jperkin Exp $ SHA1 (xworld-2.0.tar.gz) = 99217a8f0b63ef8685c5508fbbff4f5d7bb9b9a8 RMD160 (xworld-2.0.tar.gz) = b139357f529a8df535f82fecd74319b0f82605b3 @@ -13,3 +13,4 @@ SHA1 (patch-ag) = 88d5420cc7a463e6e4acb714d080cac6a21e1ade SHA1 (patch-ah) = 197774f90d9bcf3f8c8a642287ea7385d27e6413 SHA1 (patch-ai) = baa09051d09230d7b0371aae7f89451789d32e85 SHA1 (patch-aj) = 75a7ffa80e2516de08af741b7e8aa5828747f7cc +SHA1 (patch-defaults_Solaris_set.csh) = 179763e7e3ba4463ae117468246abc9ce76940c6 diff --git a/x11/xworld/patches/patch-defaults_Solaris_set.csh b/x11/xworld/patches/patch-defaults_Solaris_set.csh new file mode 100644 index 00000000000..4c2a1c756c3 --- /dev/null +++ b/x11/xworld/patches/patch-defaults_Solaris_set.csh @@ -0,0 +1,21 @@ +$NetBSD: patch-defaults_Solaris_set.csh,v 1.1 2013/10/24 10:10:21 jperkin Exp $ + +Use pkgsrc variables. + +--- defaults/Solaris/set.csh.orig 1999-07-28 15:24:23.000000000 +0000 ++++ defaults/Solaris/set.csh +@@ -1,8 +1,8 @@ +-set CAT = /bin/cat +-set CC = /opt/SUNWspro/bin/cc ++set CAT = cat ++set CC = cc + set CFLAGS = "-O" +-set INSTALL = "/usr/ucb/install -c" +-set STRIP = /usr/ccs/bin/strip +-set INCLUDES = "-I/usr/openwin/include" +-set LDLIBS = "-lm -L/usr/openwin/lib -lX11" ++set INSTALL = false ++set STRIP = strip ++set INCLUDES = "-I@X11BASE@/include" ++set LDLIBS = "-lm -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -lX11" + set MORELIBS = "-lsocket -lnsl" |