From 5c6342ac11e54117ba5d2f0b8eb8f170c8def4fa Mon Sep 17 00:00:00 2001 From: rh Date: Sun, 15 Oct 2000 18:01:09 +0000 Subject: Update plib to 1.2.0. Changes are too numerous to list here. The author incorporated all NetBSD patches into this version, so none are required anymore. --- games/plib/files/md5 | 4 +-- games/plib/files/patch-sum | 12 +++----- games/plib/patches/patch-aa | 47 ---------------------------- games/plib/patches/patch-ab | 74 --------------------------------------------- games/plib/patches/patch-ac | 22 -------------- games/plib/patches/patch-ad | 17 ----------- games/plib/patches/patch-ae | 17 ----------- games/plib/patches/patch-af | 13 -------- games/plib/pkg/PLIST | 40 ++++++++++++------------ 9 files changed, 28 insertions(+), 218 deletions(-) delete mode 100644 games/plib/patches/patch-aa delete mode 100644 games/plib/patches/patch-ab delete mode 100644 games/plib/patches/patch-ac delete mode 100644 games/plib/patches/patch-ad delete mode 100644 games/plib/patches/patch-ae delete mode 100644 games/plib/patches/patch-af (limited to 'games/plib') diff --git a/games/plib/files/md5 b/games/plib/files/md5 index 0af154b2fb7..a7b3110cb7c 100644 --- a/games/plib/files/md5 +++ b/games/plib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ +$NetBSD: md5,v 1.2 2000/10/15 18:01:09 rh Exp $ -MD5 (plib-1.0.20.tar.gz) = f588a6390fe6366977ae2c9084131a35 +MD5 (plib-1.2.0.tar.gz) = 1c377366275323d6990f7be11b9a840b diff --git a/games/plib/files/patch-sum b/games/plib/files/patch-sum index 08ebecc844e..9ea59856e0b 100644 --- a/games/plib/files/patch-sum +++ b/games/plib/files/patch-sum @@ -1,8 +1,6 @@ -$NetBSD: patch-sum,v 1.2 2000/08/04 02:00:46 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/10/15 18:01:09 rh Exp $ -MD5 (patch-aa) = 99428518086327a9397823ad5b06372e -MD5 (patch-ab) = 9485c4b1aa22f62446103f2fb9b4e240 -MD5 (patch-ac) = c2d68548f24f43142fac355555823d57 -MD5 (patch-ad) = cc40ca79ae3af7a146dbe5ebb1bcb60c -MD5 (patch-ae) = 9f773e10721ed4d04824710eb93060c1 -MD5 (patch-af) = 847c2310d51e100f9fd76efaa18a4d8f +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa deleted file mode 100644 index 4fd51192560..00000000000 --- a/games/plib/patches/patch-aa +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ - ---- configure.orig Sat Oct 30 02:26:14 1999 -+++ configure Sat Feb 19 21:51:23 2000 -@@ -2917,6 +2917,42 @@ - echo "$ac_t""no" 1>&6 - fi - -+ac_safe=`echo "machine/joystick.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for machine/joystick.h""... $ac_c" 1>&6 -+echo "configure:2887: checking for machine/joystick.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:2897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define MACHINE_JOYSTICK_IS_PRESENT 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ - ac_safe=`echo "linux/joystick.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for linux/joystick.h""... $ac_c" 1>&6 - echo "configure:2923: checking for linux/joystick.h" >&5 diff --git a/games/plib/patches/patch-ab b/games/plib/patches/patch-ab deleted file mode 100644 index 4f831b9de33..00000000000 --- a/games/plib/patches/patch-ab +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2000/08/04 02:00:47 jlam Exp $ - ---- src/js/js.h.orig Sat Oct 16 17:08:01 1999 -+++ src/js/js.h Thu Aug 3 21:42:03 2000 -@@ -29,7 +29,8 @@ - # include - # include - --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - # include - # define JS_DATA_TYPE joystick - # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) -@@ -76,7 +77,8 @@ - #ifdef WIN32 - # define _JS_MAX_AXES 6 - #else --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - # define _JS_MAX_AXES 2 - # else - # define _JS_MAX_AXES 6 -@@ -85,7 +87,8 @@ - - class jsJoystick - { --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - int id ; - #endif - #ifdef WIN32 -@@ -153,7 +156,8 @@ - } - - #else --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - FILE *joyfile; - char joyfname[1024]; - int noargs, in_no_axes; -@@ -178,7 +182,8 @@ - if ( error ) - return ; - --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - - float axes[_JS_MAX_AXES]; - int buttons[_JS_MAX_AXES]; -@@ -316,7 +321,8 @@ - default : num_axes = 0 ; setError () ; break ; - } - #else --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - id = ident; - sprintf ( fname, "/dev/joy%d", ident ) ; - # else -@@ -467,7 +473,8 @@ - } - - if ( buttons ) --# ifdef __FreeBSD__ -+# if defined(__FreeBSD__) || \ -+ (defined(__NetBSD__) && defined(MACHINE_JOYSTICK_IS_PRESENT)) - *buttons = ( js.b1 ? 1 : 0 ) | ( js.b2 ? 2 : 0 ) ; - # else - *buttons = js.buttons ; diff --git a/games/plib/patches/patch-ac b/games/plib/patches/patch-ac deleted file mode 100644 index 755d46049ef..00000000000 --- a/games/plib/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ - ---- src/sl/slPortability.h.orig Sat Feb 19 22:11:49 2000 -+++ src/sl/slPortability.h Sat Feb 19 22:15:15 2000 -@@ -34,7 +34,7 @@ - #include - #include - --#if defined(__linux__) || defined(BSD) -+#if (defined(__linux__) || defined(BSD)) && !defined(__NetBSD__) - #define SL_USING_OSS_AUDIO 1 - #endif - -@@ -56,7 +56,7 @@ - #endif - #endif - --#ifdef __OpenBSD__ -+#if defined (__NetBSD__) || defined(__OpenBSD__) - #include - #endif - diff --git a/games/plib/patches/patch-ad b/games/plib/patches/patch-ad deleted file mode 100644 index b4c320549e9..00000000000 --- a/games/plib/patches/patch-ad +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ - ---- src/sl/slDSP.cxx.orig Sun Oct 10 18:54:44 1999 -+++ src/sl/slDSP.cxx Sat Feb 19 22:39:53 2000 -@@ -388,10 +388,10 @@ - } - - /* ------------------------------------------------------------ */ --/* OpenBSD 2.3 this should be very close to SUN Audio */ -+/* NetBSD and OpenBSD should be very close to SUN Audio */ - /* ------------------------------------------------------------ */ - --#elif defined(__OpenBSD__) || defined(SOLARIS) -+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(SOLARIS) - void slDSP::open ( char *device, int _rate, int _stereo, int _bps ) - { - diff --git a/games/plib/patches/patch-ae b/games/plib/patches/patch-ae deleted file mode 100644 index 23777a7d38c..00000000000 --- a/games/plib/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ - ---- src/sl/smMixer.cxx.orig Fri Aug 13 05:14:12 1999 -+++ src/sl/smMixer.cxx Sat Feb 19 22:41:41 2000 -@@ -156,10 +156,10 @@ - setVolume ( SOUND_MIXER_CD , left, right ) ; - } - --#elif defined(__OpenBSD__) -+#elif defined(__NetBSD__) || defined(__OpenBSD__) - - /* ------------------------------------------------------------ */ --/* OpenBSD 2.3 */ -+/* NetBSD or OpenBSD 2.3 */ - /* ------------------------------------------------------------ */ - - void smMixer::open ( char *device ) diff --git a/games/plib/patches/patch-af b/games/plib/patches/patch-af deleted file mode 100644 index 658c5870efa..00000000000 --- a/games/plib/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ - ---- src/sl/sl.h.orig Sun Oct 10 18:45:06 1999 -+++ src/sl/sl.h Sat Feb 19 22:45:03 2000 -@@ -46,7 +46,7 @@ - int error ; - int fd ; - --#ifdef __OpenBSD__ -+#if defined (__NetBSD__) || defined(__OpenBSD__) - audio_info_t ainfo; // ioctl structure - audio_offset_t audio_offset; // offset in audiostream - long counter; // counter-written packets diff --git a/games/plib/pkg/PLIST b/games/plib/pkg/PLIST index 83cdcfdbb29..8ca179f6446 100644 --- a/games/plib/pkg/PLIST +++ b/games/plib/pkg/PLIST @@ -1,19 +1,21 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/02/19 22:32:45 rh Exp $ -include/fntLocal.h -include/js.h -include/sl.h -include/sm.h -include/slPortability.h -include/slMODPrivate.h -include/slMODfile.h -include/pu.h -include/sg.h -include/ssg.h -include/ssgKeyFlier.h -include/fnt.h -lib/libsl.a -lib/libsm.a -lib/libpu.a -lib/libsg.a -lib/libssg.a -lib/libfnt.a +@comment $NetBSD: PLIST,v 1.2 2000/10/15 18:01:12 rh Exp $ +include/plib/ul.h +include/plib/js.h +include/plib/sl.h +include/plib/slPortability.h +include/plib/sm.h +include/plib/slMODPrivate.h +include/plib/slMODfile.h +include/plib/pu.h +include/plib/sg.h +include/plib/ssg.h +include/plib/ssgKeyFlier.h +include/plib/fnt.h +include/plib/fntLocal.h +lib/libplibsl.a +lib/libplibsm.a +lib/libplibpu.a +lib/libplibsg.a +lib/libplibssg.a +lib/libplibfnt.a +@dirrm include/plib -- cgit v1.2.3