diff options
author | dholland <dholland@pkgsrc.org> | 2012-06-16 04:00:53 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-06-16 04:00:53 +0000 |
commit | bfa9b7b376942572c33f7b544f9d56510bfae3f1 (patch) | |
tree | 836d198e3fa16a841dd2d910576be19c91746ab8 /x11/xpns | |
parent | e2af5418dca1bf56ee013295b89c12ab3222c3fd (diff) | |
download | pkgsrc-bfa9b7b376942572c33f7b544f9d56510bfae3f1.tar.gz |
Fix wrong hard-wired paths in patch-ab. (was using /usr/X11R6)
While here:
- sprinkle stdlib.h widely to avoid undefined behavior calling malloc
- fix randomizer setup (was calling srand() and then using random())
- avoid installing a csh script, since we were replacing the entire
contents of the file anyhow
- add missing libXt and libX11 bl3.mk
- add patch comments
PKGREVISION -> 4.
Diffstat (limited to 'x11/xpns')
-rw-r--r-- | x11/xpns/Makefile | 13 | ||||
-rw-r--r-- | x11/xpns/distinfo | 25 | ||||
-rw-r--r-- | x11/xpns/patches/patch-aa | 5 | ||||
-rw-r--r-- | x11/xpns/patches/patch-ab | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-celldel_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-cellein_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-cellget_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-cellmisc_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-cellorg_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-cellrefr_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-filekaio_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-filesteio_c | 15 | ||||
-rw-r--r-- | x11/xpns/patches/patch-filetraio_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-hadelmisc_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-hakasete_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-halook_c | 15 | ||||
-rw-r--r-- | x11/xpns/patches/patch-harefreshx_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-hi_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-kaio_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-simbreak_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-simget_c | 29 | ||||
-rw-r--r-- | x11/xpns/patches/patch-steio_c | 14 | ||||
-rw-r--r-- | x11/xpns/patches/patch-traio_c | 15 |
23 files changed, 327 insertions, 14 deletions
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile index 660f1cdc528..3c5f9d62788 100644 --- a/x11/xpns/Makefile +++ b/x11/xpns/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2012/02/07 06:42:56 sbd Exp $ +# $NetBSD: Makefile,v 1.27 2012/06/16 04:00:53 dholland Exp $ DISTNAME= pns_source PKGNAME= xpns-1.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 cad MASTER_SITES= http://robotics.ee.uwa.edu.au/pns/ftp/ EXTRACT_SUFX= .tar.Z @@ -14,12 +14,13 @@ COMMENT= Petri-Net Simulator for Xwindows PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR} -USE_X11BASE= yes MAKE_FILE= makefile BUILD_TARGET= pns -USE_TOOLS+= csh:run -REPLACE_CSH= xpns +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= xpns +SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' INSTALLATION_DIRS= bin lib/xpns share/doc/xpns @@ -31,4 +32,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.net ${DESTDIR}${PREFIX}/share/doc/xpns/ .include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpns/distinfo b/x11/xpns/distinfo index dba167e9fc7..18115d8ce77 100644 --- a/x11/xpns/distinfo +++ b/x11/xpns/distinfo @@ -1,7 +1,26 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:36:25 wiz Exp $ +$NetBSD: distinfo,v 1.4 2012/06/16 04:00:53 dholland Exp $ SHA1 (pns_source.tar.Z) = 2fab75ecdcddba9250a836740821202d8b19f5b8 RMD160 (pns_source.tar.Z) = 0f55bf6c830f179dd0d20e32884159ab2f8fea1d Size (pns_source.tar.Z) = 256925 bytes -SHA1 (patch-aa) = 65b4aadd67e2d0211e8f5c1b14f49061404a272d -SHA1 (patch-ab) = f32b75e6be49c02eb6e5e196c718a573570de6e3 +SHA1 (patch-aa) = b8be29ee29c4c3cf7b7c8e4d3d5572b1dd3b29db +SHA1 (patch-ab) = 7069667e197b66dfb36a34d4c1468df646d2a8e0 +SHA1 (patch-celldel_c) = bacd0943af1e921624d92cb84cf99f9eb11d5f5b +SHA1 (patch-cellein_c) = b6b0600277eb3daba0a4aec2ab5bec42bcde2ced +SHA1 (patch-cellget_c) = 638ea2bda48b7e8d0ae8d12156cdc218f6434924 +SHA1 (patch-cellmisc_c) = daaa396703e1ff13ae39c91893cae6122275a8f5 +SHA1 (patch-cellorg_c) = 63d896ebea88078de378ae8f35779c32276e5c06 +SHA1 (patch-cellrefr_c) = 4349f32f29f64dc53e2b5d12b64141980795e9fb +SHA1 (patch-filekaio_c) = 92ef6420060a9f81f73584e6ecfc3a30d1dd11f5 +SHA1 (patch-filesteio_c) = 482fc6a7eadbb53962a72045bfb8510ec7321f0b +SHA1 (patch-filetraio_c) = 5648f5cdb9749dba9c8fa6044345c57f32aebf0e +SHA1 (patch-hadelmisc_c) = ae7b49b1b62b7397bc6d4903956d7696982a2b8c +SHA1 (patch-hakasete_c) = 29a5796a38864f62e99f6f303c51da6f7c262f0d +SHA1 (patch-halook_c) = bf6f0916edf872be522fe916629e4aaa643948fa +SHA1 (patch-harefreshx_c) = d6c915f9c5fec26a3e0a6af8a075083067632fea +SHA1 (patch-hi_c) = d3223a1f4959fab578313c79dab782be3d06beaa +SHA1 (patch-kaio_c) = e88a88faa60c0c36be49de48986bb648c26f4dab +SHA1 (patch-simbreak_c) = efb548e9e69f27ed085645c7ce755e69228d75b7 +SHA1 (patch-simget_c) = 6d4ffb1dbacb86bf3527e13e743abc6690223602 +SHA1 (patch-steio_c) = 4d01d2f4a8f1b62cd6be68100441ff57349defa2 +SHA1 (patch-traio_c) = ce4cb8626412893889d75f36c29704686812f3d8 diff --git a/x11/xpns/patches/patch-aa b/x11/xpns/patches/patch-aa index 1ab484aa40b..f51a7878181 100644 --- a/x11/xpns/patches/patch-aa +++ b/x11/xpns/patches/patch-aa @@ -1,4 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2000/09/03 14:56:28 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2012/06/16 04:00:54 dholland Exp $ + +Configure for pkgsrc. + --- makefile.orig Wed Jul 14 04:05:14 1993 +++ makefile Tue Apr 25 21:02:22 2000 @@ -7,19 +7,19 @@ diff --git a/x11/xpns/patches/patch-ab b/x11/xpns/patches/patch-ab index c3e65294976..3c176c6d1a9 100644 --- a/x11/xpns/patches/patch-ab +++ b/x11/xpns/patches/patch-ab @@ -1,15 +1,19 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 11:18:29 agc Exp $ +$NetBSD: patch-ab,v 1.3 2012/06/16 04:00:54 dholland Exp $ + +- don't use csh (no reason to) +- provide correct paths --- xpns.orig Tue Apr 8 11:27:14 1997 +++ xpns Tue Apr 8 11:29:05 1997 -@@ -1,6 +1,7 @@ +@@ -1,6 +1,8 @@ -#!/bin/tcsh -setenv XAPPLRESDIR $PWD/ -pns -+#!/bin/csh -+setenv XAPPLRESDIR /usr/X11R6/lib/xpns/ ++#!/bin/sh +# Note pns will dump core if environment is not correct -+/usr/X11R6/lib/xpns/pns ++XAPPLRESDIR=@PREFIX@/lib/xpns/ ++export XAPPLRESDIR ++@PREFIX@/lib/xpns/pns diff --git a/x11/xpns/patches/patch-celldel_c b/x11/xpns/patches/patch-celldel_c new file mode 100644 index 00000000000..5e4da26034a --- /dev/null +++ b/x11/xpns/patches/patch-celldel_c @@ -0,0 +1,14 @@ +$NetBSD: patch-celldel_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- celldel.c~ 1993-07-14 11:02:14.000000000 +0000 ++++ celldel.c +@@ -17,6 +17,7 @@ + #include "cellrefr.h" + + #include <stdio.h> ++#include <stdlib.h> + + + #define CellOListToRList( v) do { \ diff --git a/x11/xpns/patches/patch-cellein_c b/x11/xpns/patches/patch-cellein_c new file mode 100644 index 00000000000..b5098890092 --- /dev/null +++ b/x11/xpns/patches/patch-cellein_c @@ -0,0 +1,14 @@ +$NetBSD: patch-cellein_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- cellein.c~ 1993-07-14 11:02:14.000000000 +0000 ++++ cellein.c +@@ -14,6 +14,7 @@ + #include "celltype.h" + + #include <stdio.h> ++#include <stdlib.h> + + + /************************************************************************* diff --git a/x11/xpns/patches/patch-cellget_c b/x11/xpns/patches/patch-cellget_c new file mode 100644 index 00000000000..5ab0e3a9c1c --- /dev/null +++ b/x11/xpns/patches/patch-cellget_c @@ -0,0 +1,14 @@ +$NetBSD: patch-cellget_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- cellget.c~ 1993-07-14 11:02:14.000000000 +0000 ++++ cellget.c +@@ -16,6 +16,7 @@ + + + #include <stdio.h> ++#include <stdlib.h> + + + static OBJECT *pSte, *pTra, *pK; diff --git a/x11/xpns/patches/patch-cellmisc_c b/x11/xpns/patches/patch-cellmisc_c new file mode 100644 index 00000000000..bae4b2201e0 --- /dev/null +++ b/x11/xpns/patches/patch-cellmisc_c @@ -0,0 +1,14 @@ +$NetBSD: patch-cellmisc_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- cellmisc.c~ 1993-07-14 11:02:13.000000000 +0000 ++++ cellmisc.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "cellmisc.h" + #include "cell.h" + #include "misc.h" diff --git a/x11/xpns/patches/patch-cellorg_c b/x11/xpns/patches/patch-cellorg_c new file mode 100644 index 00000000000..989aa2f4571 --- /dev/null +++ b/x11/xpns/patches/patch-cellorg_c @@ -0,0 +1,14 @@ +$NetBSD: patch-cellorg_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- cellorg.c~ 1993-07-14 11:02:14.000000000 +0000 ++++ cellorg.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "cellorg.h" + #include "celltype.h" + #include "ste.h" diff --git a/x11/xpns/patches/patch-cellrefr_c b/x11/xpns/patches/patch-cellrefr_c new file mode 100644 index 00000000000..dd8e6f51a18 --- /dev/null +++ b/x11/xpns/patches/patch-cellrefr_c @@ -0,0 +1,14 @@ +$NetBSD: patch-cellrefr_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- cellrefr.c~ 1993-07-14 11:02:14.000000000 +0000 ++++ cellrefr.c +@@ -15,6 +15,7 @@ + + + #include <stdio.h> ++#include <stdlib.h> + + + /************************************************************************* diff --git a/x11/xpns/patches/patch-filekaio_c b/x11/xpns/patches/patch-filekaio_c new file mode 100644 index 00000000000..9cfcb1a0d84 --- /dev/null +++ b/x11/xpns/patches/patch-filekaio_c @@ -0,0 +1,14 @@ +$NetBSD: patch-filekaio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- filekaio.c~ 1993-07-14 11:02:10.000000000 +0000 ++++ filekaio.c +@@ -19,6 +19,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + + diff --git a/x11/xpns/patches/patch-filesteio_c b/x11/xpns/patches/patch-filesteio_c new file mode 100644 index 00000000000..5183e33c3fd --- /dev/null +++ b/x11/xpns/patches/patch-filesteio_c @@ -0,0 +1,15 @@ +$NetBSD: patch-filesteio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- filesteio.c~ 1993-07-14 11:02:09.000000000 +0000 ++++ filesteio.c +@@ -18,7 +18,7 @@ + + #include <string.h> + #include <stdio.h> +- ++#include <stdlib.h> + + + diff --git a/x11/xpns/patches/patch-filetraio_c b/x11/xpns/patches/patch-filetraio_c new file mode 100644 index 00000000000..b930dc1c878 --- /dev/null +++ b/x11/xpns/patches/patch-filetraio_c @@ -0,0 +1,14 @@ +$NetBSD: patch-filetraio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- filetraio.c~ 1993-07-14 11:02:09.000000000 +0000 ++++ filetraio.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "filetraio.h" + #include "tra.h" + #include "misc.h" diff --git a/x11/xpns/patches/patch-hadelmisc_c b/x11/xpns/patches/patch-hadelmisc_c new file mode 100644 index 00000000000..d8c2d807702 --- /dev/null +++ b/x11/xpns/patches/patch-hadelmisc_c @@ -0,0 +1,14 @@ +$NetBSD: patch-hadelmisc_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- hadelmisc.c~ 1993-07-14 11:02:16.000000000 +0000 ++++ hadelmisc.c +@@ -22,6 +22,7 @@ + #include "cellget.h" + + #include <stdio.h> ++#include <stdlib.h> + + + /************************************************************************* diff --git a/x11/xpns/patches/patch-hakasete_c b/x11/xpns/patches/patch-hakasete_c new file mode 100644 index 00000000000..de7faa9213b --- /dev/null +++ b/x11/xpns/patches/patch-hakasete_c @@ -0,0 +1,14 @@ +$NetBSD: patch-hakasete_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- hakasete.c~ 1993-07-14 11:02:13.000000000 +0000 ++++ hakasete.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "hakasete.h" + #include "haka.h" + #include "haka.H" diff --git a/x11/xpns/patches/patch-halook_c b/x11/xpns/patches/patch-halook_c new file mode 100644 index 00000000000..5c4ea2dc998 --- /dev/null +++ b/x11/xpns/patches/patch-halook_c @@ -0,0 +1,15 @@ +$NetBSD: patch-halook_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- halook.c~ 1993-07-14 11:02:16.000000000 +0000 ++++ halook.c +@@ -18,7 +18,7 @@ + #include "stewin.h" + + #include <stdio.h> +- ++#include <stdlib.h> + + + diff --git a/x11/xpns/patches/patch-harefreshx_c b/x11/xpns/patches/patch-harefreshx_c new file mode 100644 index 00000000000..dd7512de21b --- /dev/null +++ b/x11/xpns/patches/patch-harefreshx_c @@ -0,0 +1,14 @@ +$NetBSD: patch-harefreshx_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- harefreshx.c~ 1993-07-14 11:02:16.000000000 +0000 ++++ harefreshx.c +@@ -25,6 +25,7 @@ + #include "hastename.h" + + #include <stdio.h> ++#include <stdlib.h> + + #ifdef HALLO + diff --git a/x11/xpns/patches/patch-hi_c b/x11/xpns/patches/patch-hi_c new file mode 100644 index 00000000000..90ee181f8d1 --- /dev/null +++ b/x11/xpns/patches/patch-hi_c @@ -0,0 +1,14 @@ +$NetBSD: patch-hi_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- hi.c~ 1993-07-14 11:02:08.000000000 +0000 ++++ hi.c +@@ -22,6 +22,7 @@ + #include <X11/Xaw/Viewport.h> + #include <X11/Xaw/Paned.h> + #include <stdio.h> ++#include <stdlib.h> + + Widget HiCom; + Widget HiShell; diff --git a/x11/xpns/patches/patch-kaio_c b/x11/xpns/patches/patch-kaio_c new file mode 100644 index 00000000000..baff99e6ee7 --- /dev/null +++ b/x11/xpns/patches/patch-kaio_c @@ -0,0 +1,14 @@ +$NetBSD: patch-kaio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- kaio.c~ 1993-07-14 11:02:15.000000000 +0000 ++++ kaio.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "kaio.h" + #include "ka.h" + #include "netsize.h" diff --git a/x11/xpns/patches/patch-simbreak_c b/x11/xpns/patches/patch-simbreak_c new file mode 100644 index 00000000000..48f5ae6d53d --- /dev/null +++ b/x11/xpns/patches/patch-simbreak_c @@ -0,0 +1,14 @@ +$NetBSD: patch-simbreak_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- simbreak.c~ 1993-07-14 11:02:09.000000000 +0000 ++++ simbreak.c +@@ -10,6 +10,7 @@ + ** DATUM : 14.03.93 + ** + *************************************************************************/ ++#include <stdlib.h> + #include "simbreak.h" + #include "sim.h" + #include "celltype.h" diff --git a/x11/xpns/patches/patch-simget_c b/x11/xpns/patches/patch-simget_c new file mode 100644 index 00000000000..49f926f9825 --- /dev/null +++ b/x11/xpns/patches/patch-simget_c @@ -0,0 +1,29 @@ +$NetBSD: patch-simget_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +- fix broken RAND_MAX +- since the code calls random() here, be sure to call srandom() to + initialize. Calling srand() too should be harmless. + + +--- simget.c~ 1993-07-14 11:02:09.000000000 +0000 ++++ simget.c +@@ -19,8 +19,9 @@ + + #include <stdio.h> + +- +-#define RAND_MAX ((1<<31)-1) ++#ifndef RAND_MAX ++#define RAND_MAX ((1UL<<31)-1) ++#endif + + + /************************************************************************* +@@ -32,6 +33,7 @@ void SimGetInit() + unsigned int e; + + srand( 17); ++ srandom( 17); + } + + diff --git a/x11/xpns/patches/patch-steio_c b/x11/xpns/patches/patch-steio_c new file mode 100644 index 00000000000..167bf48ac44 --- /dev/null +++ b/x11/xpns/patches/patch-steio_c @@ -0,0 +1,14 @@ +$NetBSD: patch-steio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Ues standard headers. + +--- steio.c~ 1993-07-14 11:02:15.000000000 +0000 ++++ steio.c +@@ -15,6 +15,7 @@ + #include "celltype.h" + #include "netsize.h" + #include <stdio.h> ++#include <stdlib.h> + + + #define DEFAULT_STEN_X_DISP -HA_STE_RAD diff --git a/x11/xpns/patches/patch-traio_c b/x11/xpns/patches/patch-traio_c new file mode 100644 index 00000000000..2f8c606a018 --- /dev/null +++ b/x11/xpns/patches/patch-traio_c @@ -0,0 +1,15 @@ +$NetBSD: patch-traio_c,v 1.1 2012/06/16 04:00:54 dholland Exp $ + +Use standard headers. + +--- traio.c~ 1993-07-14 11:02:15.000000000 +0000 ++++ traio.c +@@ -15,7 +15,7 @@ + #include "celltype.h" + #include "netsize.h" + #include <stdio.h> +- ++#include <stdlib.h> + + #define DEFAULT_TRAN_X_DISP -HA_STE_RAD + #define DEFAULT_TRAN_Y_DISP -HA_STE_RAD-5 |