pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/scm Pull common standard definitions in one place.
details: https://anonhg.NetBSD.org/pkgsrc/rev/fc7b51071465
branches: trunk
changeset: 604364:fc7b51071465
user: asau <asau%pkgsrc.org@localhost>
date: Tue May 29 20:50:35 2012 +0000
description:
Pull common standard definitions in one place.
Addresses PR 46496, inspired by original patch by Alexander Polakov.
diffstat:
lang/scm/Makefile | 4 +-
lang/scm/distinfo | 4 +-
lang/scm/patches/patch-ad | 80 ++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 76 insertions(+), 12 deletions(-)
diffs (125 lines):
diff -r 0183e25feed0 -r fc7b51071465 lang/scm/Makefile
--- a/lang/scm/Makefile Tue May 29 20:37:30 2012 +0000
+++ b/lang/scm/Makefile Tue May 29 20:50:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2010/02/04 01:37:19 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2012/05/29 20:50:35 asau Exp $
#
# Convert the version number as follows 2d2 -> 2.4.2, where the d is
# changed to a 4, representing the 4th letter.
@@ -8,7 +8,7 @@
DISTNAME= scm5e3
PKGNAME= scm-5.5.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= http://swissnet.ai.mit.edu/ftpdir/scm/
EXTRACT_SUFX= .zip
diff -r 0183e25feed0 -r fc7b51071465 lang/scm/distinfo
--- a/lang/scm/distinfo Tue May 29 20:37:30 2012 +0000
+++ b/lang/scm/distinfo Tue May 29 20:50:35 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/08/02 14:47:24 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/05/29 20:50:35 asau Exp $
SHA1 (scm5e3.zip) = 3d7a0160357840c6a96ef9ded6fb31d92507561d
RMD160 (scm5e3.zip) = 91f97bf4efd6bf734fe3e789762a90f20ad7b9b2
@@ -6,7 +6,7 @@
SHA1 (patch-aa) = 456277f5bbce1fd90c0683a6fa66d7946aa84d07
SHA1 (patch-ab) = 9b3b078bdebad4bc12bd52d6a2db202d5cf88f89
SHA1 (patch-ac) = 248981dd6fe1e099dc747d2dfca14671e60a9897
-SHA1 (patch-ad) = 8f5a993d4adcb053884985f966ceb2092999ff70
+SHA1 (patch-ad) = 3510daaa41a19539b196ae345f832b129bcaa0e5
SHA1 (patch-ae) = dc6691615dced4295ce1fa21dff5c1b955de858b
SHA1 (patch-af) = 8b8d61bf9a20ae3185c2b63ed4f56649ee80d7dc
SHA1 (patch-ag) = 2e5b570e7664d2193bfd7e8e25c7e565a7aaf793
diff -r 0183e25feed0 -r fc7b51071465 lang/scm/patches/patch-ad
--- a/lang/scm/patches/patch-ad Tue May 29 20:37:30 2012 +0000
+++ b/lang/scm/patches/patch-ad Tue May 29 20:50:35 2012 +0000
@@ -1,13 +1,77 @@
-$NetBSD: patch-ad,v 1.1 2006/02/19 17:50:11 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2012/05/29 20:50:35 asau Exp $
+
+Pull common standard definitions in one place.
---- findexec.c.orig 2006-02-08 17:53:00.000000000 +0000
-+++ findexec.c
-@@ -78,7 +78,7 @@ Wed Feb 21 23:06:35 1996 Aubrey Jaffer
+--- findexec.c.orig 2002-06-02 08:54:47.000000000 +0400
++++ findexec.c 2012-05-30 00:44:57.000000000 +0400
+@@ -41,68 +41,22 @@
+ # ifndef PLAN9
+ # include <sys/file.h>
+ # include <sys/param.h>
+-# endif
+-# ifdef linux
+-# include <stdlib.h>
++# include <sys/types.h>
+ # include <sys/stat.h>
+-# include <unistd.h> /* for X_OK define */
+-# endif
+-# ifdef __SVR4
+ # include <string.h>
+ # include <stdlib.h>
+-# include <sys/stat.h>
+ # include <unistd.h> /* for X_OK define */
+-# else
+-# ifdef __sgi__
+-# include <string.h>
+-# include <stdlib.h>
+-# include <sys/stat.h>
+-# include <unistd.h> /* for X_OK define */
+-# else
++# endif
+ # ifdef PLAN9
+ # include <u.h>
+ # include <libc.h>
+ # define getcwd getwd
+ # define MAXPATHLEN 256 /* arbitrary? */
+ # define X_OK AEXEC
+-# else
+-# include <strings.h>
+ # endif
+-# endif
+-# endif
+-# ifdef __amigaos__
+-# include <stdlib.h>
+-# include <sys/stat.h>
+-# include <unistd.h>
+-# endif
# ifndef __STDC__
# define const /**/
# endif
-# ifdef __FreeBSD__
-+# if defined(__FreeBSD__) || defined(__DragonFly__)
- /* This might be same for 44bsd derived system. */
- # include <sys/types.h>
- # include <sys/stat.h>
+-/* This might be same for 44bsd derived system. */
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-# endif
+-# ifdef __NetBSD__
+-# include <stdlib.h>
+-# include <unistd.h>
+-# endif
+-# ifdef __OpenBSD__
+-/* This might be same for 44bsd derived system. */
+-# include <stdlib.h>
+-# include <unistd.h>
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-# endif
+-# ifdef __alpha
+-# include <string.h>
+-# include <stdlib.h>
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-# endif
+-# ifdef GO32
+-# include <sys/stat.h>
+-# endif
+
+ # ifndef DEFAULT_PATH
+ # define DEFAULT_PATH ".:~/bin::/usr/local/bin:/usr/new:/usr/ucb:/usr/bin:/bin:/usr/hosts"
Home |
Main Index |
Thread Index |
Old Index