diff options
author | dholland <dholland@pkgsrc.org> | 2012-07-30 04:23:23 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-07-30 04:23:23 +0000 |
commit | 9c4e56e33e4ffd27d6d8969ec952652bef80d3b2 (patch) | |
tree | 52ee43b8d25cdfdbafc08a63e445342068fdb140 | |
parent | 6bce3fc84d8c982ed92ebed0275fc8594b92152b (diff) | |
download | pkgsrc-9c4e56e33e4ffd27d6d8969ec952652bef80d3b2.tar.gz |
Fix pkglint. Add patch comments. Do configuration SUBSTs at pre-configure
time, not post-patch, to reduce the chances of the results being rolled
unconditionally into patches.
-rw-r--r-- | x11/xworld/Makefile | 8 | ||||
-rw-r--r-- | x11/xworld/distinfo | 14 | ||||
-rw-r--r-- | x11/xworld/patches/patch-aa | 4 | ||||
-rw-r--r-- | x11/xworld/patches/patch-ac | 20 | ||||
-rw-r--r-- | x11/xworld/patches/patch-ag | 4 | ||||
-rw-r--r-- | x11/xworld/patches/patch-ah | 4 | ||||
-rw-r--r-- | x11/xworld/patches/patch-ai | 4 | ||||
-rw-r--r-- | x11/xworld/patches/patch-aj | 5 |
8 files changed, 41 insertions, 22 deletions
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 4874a127495..3debe3d3b67 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/05/01 15:33:43 zafer Exp $ +# $NetBSD: Makefile,v 1.20 2012/07/30 04:23:23 dholland Exp $ # DISTNAME= xworld-2.0 @@ -15,13 +15,13 @@ HAS_CONFIGURE= yes USE_TOOLS+= csh CONFIG_SHELL= ${CSH} -CONFIGURE_ENV+= PREFIX=${PREFIX:Q} -CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" +CONFIGURE_ENV+= PREFIX=${PREFIX} +CONFIGURE_ENV+= LDLIBS=-lm\ ${LDFLAGS:Q}\ -lX11 CONFIGURE_ENV+= CAT=${CAT:Q} STRIP=strip INCLUDES="" MORELIBS="" SUBST_CLASSES+= x11 SUBST_MESSAGE.x11= Fixing x11 options. -SUBST_STAGE.x11= post-patch +SUBST_STAGE.x11= pre-configure SUBST_FILES.x11= defaults/NetBSD/set.csh SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g' diff --git a/x11/xworld/distinfo b/x11/xworld/distinfo index e14846886f6..10fa8129f76 100644 --- a/x11/xworld/distinfo +++ b/x11/xworld/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.9 2009/02/23 18:32:36 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/07/30 04:23:23 dholland 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-aa) = bae4e8be7dbe302c11012109a2971e7aadb2a357 SHA1 (patch-ab) = 60d1591c3c155e9fbf6bac094b20cd6a6df73df0 -SHA1 (patch-ac) = 6907ce3a08c8c8ab3689d7c1956e5d86f6265fbf +SHA1 (patch-ac) = 9d86f4b5837fc36a6f4124f3b849887586c68af1 SHA1 (patch-ad) = d243d16ef9d79e82c817ae116b3a9b9cba71a1eb SHA1 (patch-ae) = 5abdb1a4a6133fee1f5d3a83625a41c27e07c912 SHA1 (patch-af) = cf41e600032bea1c3b2cbd5436160b412fad7010 -SHA1 (patch-ag) = b764304482e74438464cebdf8880381074887588 -SHA1 (patch-ah) = ee85c12a0b6d4355a235c6e26679448758067190 -SHA1 (patch-ai) = 2c22ad01c6adb966c7b445d86c1939fa4d8328c9 -SHA1 (patch-aj) = 0d8e63ab485b3cb43750cc34554025ba1316810f +SHA1 (patch-ag) = 88d5420cc7a463e6e4acb714d080cac6a21e1ade +SHA1 (patch-ah) = 197774f90d9bcf3f8c8a642287ea7385d27e6413 +SHA1 (patch-ai) = baa09051d09230d7b0371aae7f89451789d32e85 +SHA1 (patch-aj) = 75a7ffa80e2516de08af741b7e8aa5828747f7cc diff --git a/x11/xworld/patches/patch-aa b/x11/xworld/patches/patch-aa index 236d6631090..70003be5599 100644 --- a/x11/xworld/patches/patch-aa +++ b/x11/xworld/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2002/08/25 21:53:05 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2012/07/30 04:23:23 dholland Exp $ + +Configure for pkgsrc. --- defaults/customize.csh.orig Wed Jul 28 11:44:52 1999 +++ defaults/customize.csh diff --git a/x11/xworld/patches/patch-ac b/x11/xworld/patches/patch-ac index ba1e22e294f..d03b31b4a27 100644 --- a/x11/xworld/patches/patch-ac +++ b/x11/xworld/patches/patch-ac @@ -1,13 +1,21 @@ -$NetBSD: patch-ac,v 1.2 2005/06/20 10:58:17 wennmach Exp $ +$NetBSD: patch-ac,v 1.3 2012/07/30 04:23:23 dholland Exp $ ---- 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 @@ +Configure for pkgsrc. + +--- defaults/NetBSD/set.csh.orig 1999-07-28 15:13:06.000000000 +0000 ++++ defaults/NetBSD/set.csh +@@ -1,8 +1,8 @@ +-set CAT = /bin/cat +-set CC = /usr/bin/cc ++set CAT = cat ++set CC = cc set CFLAGS = "-O2 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wformat" - set INSTALL = "/usr/bin/install -c" - set STRIP = "/usr/bin/strip" +-set INSTALL = "/usr/bin/install -c" +-set STRIP = "/usr/bin/strip" -set INCLUDES = "-I/usr/X11R6/include" -set LDLIBS = "-lm -L/usr/X11R6/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 = " " diff --git a/x11/xworld/patches/patch-ag b/x11/xworld/patches/patch-ag index 6419871bcdd..9e0f7be53ad 100644 --- a/x11/xworld/patches/patch-ag +++ b/x11/xworld/patches/patch-ag @@ -1,4 +1,6 @@ -$NetBSD: patch-ag,v 1.1 2005/06/25 00:40:20 minskim Exp $ +$NetBSD: patch-ag,v 1.2 2012/07/30 04:23:23 dholland Exp $ + +Cope with spaces in uname output. --- configure.orig 1999-07-28 11:21:59.000000000 -0500 +++ configure diff --git a/x11/xworld/patches/patch-ah b/x11/xworld/patches/patch-ah index 48f33657e84..731cd366c57 100644 --- a/x11/xworld/patches/patch-ah +++ b/x11/xworld/patches/patch-ah @@ -1,4 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2006/02/19 01:40:26 schwarz Exp $ +$NetBSD: patch-ah,v 1.2 2012/07/30 04:23:23 dholland Exp $ + +IRIX 5 hack. --- compile_world.c.orig 2006-02-19 02:24:33.000000000 +0100 +++ compile_world.c 2006-02-19 02:26:05.000000000 +0100 diff --git a/x11/xworld/patches/patch-ai b/x11/xworld/patches/patch-ai index 5e054ceb60c..a475056bdb1 100644 --- a/x11/xworld/patches/patch-ai +++ b/x11/xworld/patches/patch-ai @@ -1,4 +1,6 @@ -$NetBSD: patch-ai,v 1.1 2006/02/19 01:40:26 schwarz Exp $ +$NetBSD: patch-ai,v 1.2 2012/07/30 04:23:23 dholland Exp $ + +IRIX 5 hack. --- xworld.c.orig 2006-02-19 02:25:25.000000000 +0100 +++ xworld.c 2006-02-19 02:26:37.000000000 +0100 diff --git a/x11/xworld/patches/patch-aj b/x11/xworld/patches/patch-aj index 76e34ce8d07..d6ccf19df4a 100644 --- a/x11/xworld/patches/patch-aj +++ b/x11/xworld/patches/patch-aj @@ -1,4 +1,7 @@ -$NetBSD: patch-aj,v 1.1 2009/02/23 18:32:36 joerg Exp $ +$NetBSD: patch-aj,v 1.2 2012/07/30 04:23:23 dholland Exp $ + +- destdir support +- use pkgsrc install program --- Makefile.in.orig 2009-02-23 19:29:15.000000000 +0100 +++ Makefile.in |