[pkgsrc/trunk]: pkgsrc/devel/nspr Merge with / update using the package provi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/nspr Merge with / update using the package provi...
From: jschauma <jschauma%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:16:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/eab50d03eb15
branches:  trunk
changeset: 488185:eab50d03eb15
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Tue Jan 25 14:50:38 2005 +0000

description:
Merge with / update using the package provided by matthewluckie in
pkgsrc-wip.

diffstat:

 devel/nspr/Makefile         |   53 +++++++++++++++--
 devel/nspr/PLIST            |   15 ++---
 devel/nspr/buildlink3.mk    |   19 ++++++
 devel/nspr/distinfo         |   13 +++-
 devel/nspr/patches/patch-aa |  125 ++++++++++++++++++++++++++++++++++++++++++++
 devel/nspr/patches/patch-ab |   72 +++++++++++++++++++++++++
 devel/nspr/patches/patch-ac |   22 +++++++
 devel/nspr/patches/patch-ad |   19 ++++++
 devel/nspr/patches/patch-ae |   13 ++++
 devel/nspr/patches/patch-af |   17 +++++
 10 files changed, 348 insertions(+), 20 deletions(-)

diffs (truncated from 440 to 300 lines):

diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/Makefile
--- a/devel/nspr/Makefile       Tue Jan 25 14:36:38 2005 +0000
+++ b/devel/nspr/Makefile       Tue Jan 25 14:50:38 2005 +0000
@@ -1,17 +1,43 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/24 19:40:59 jschauma Exp $
-#
+# $NetBSD: Makefile,v 1.2 2005/01/25 14:50:38 jschauma Exp $
 
-DISTNAME=              nspr-4.3
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/mozilla/nsprpub
+DISTNAME=              nspr-4.4.1
 CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_MOZILLA:=../../nspr/releases/v4.3/src/}
+MASTER_SITES?=         ${MASTER_SIZE_MOZILLA:=nspr/releases/v4.4.1/src}
 
-MAINTAINER=            jschauma%NetBSD.org@localhost
-HOMEPAGE=              ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.3/README
+MAINTAINER=            mjl%luckie.org.nz@localhost
+HOMEPAGE=              http://www.mozilla.org/projects/nspr/index.html
 COMMENT=               Platform-neutral API for system level and libc like functions
 
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
+
+USE_BUILDLINK3=                YES
+USE_GNU_TOOLS+=                make
 GNU_CONFIGURE=         YES
-USE_GNU_TOOLS+=                make
+
+CONFIGURE_ARGS+=       --disable-debug
+
+AUTOCONF_REQD=         2.13
+
+MAKE_ENV=              DIST=${WRKSRC}/dist
+CONFIGURE_SCRIPT=      ../configure
+CONFIGURE_ENV=         LIBRUNPATH=${PREFIX}/lib
+
+.include               "../../mk/bsd.prefs.mk"
+
+.if ${OBJECT_FMT} == "ELF"
+SO_SUFFIX=             so
+SCRIPTS_ENV+=          NSPR_INSTALL_LIB="${INSTALL_PROGRAM}"
+.elif ${OBJECT_FMT} == "Mach-O"
+SO_SUFFIX=             dylib
+SCRIPTS_ENV+=          NSPR_INSTALL_LIB="${INSTALL_LIB}"
+.else
+SO_SUFFIX=             so.1.0
+SCRIPTS_ENV+=          NSPR_INSTALL_LIB="${INSTALL_PROGRAM}"
+.endif
+PLIST_SUBST+=          SO_SUFFIX=${SO_SUFFIX}
+
+pre-configure:
+       cd ${WRKSRC}/.. && ${AUTOCONF}
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/include/nspr
@@ -19,4 +45,15 @@
        (cd ${WRKSRC}/dist/lib && ${PAX} -Lrwvpe . ${PREFIX}/lib/ )
        ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
 
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+CONFIGURE_ARGS+=       --without-pthreads
+.else
+CONFIGURE_ARGS+=       --with-pthreads
+.endif
+
+.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
+
diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/PLIST
--- a/devel/nspr/PLIST  Tue Jan 25 14:36:38 2005 +0000
+++ b/devel/nspr/PLIST  Tue Jan 25 14:50:38 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/24 19:40:59 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/25 14:50:39 jschauma Exp $
 bin/nspr-config
 include/nspr/md/_aix.h
 include/nspr/md/_aix32.cfg
@@ -26,8 +26,8 @@
 include/nspr/md/_ncr.h
 include/nspr/md/_nec.cfg
 include/nspr/md/_nec.h
-include/nspr/md/_${LOWER_OPSYS}.cfg
-include/nspr/md/_${LOWER_OPSYS}.h
+include/nspr/md/_netbsd.cfg
+include/nspr/md/_netbsd.h
 include/nspr/md/_nextstep.cfg
 include/nspr/md/_nextstep.h
 include/nspr/md/_nspr_pthread.h
@@ -129,12 +129,9 @@
 include/nspr/prtypes.h
 include/nspr/prvrsion.h
 include/nspr/prwin16.h
-lib/libnspr4.a
-lib/libnspr4.so
-lib/libplc4.a
-lib/libplc4.so
-lib/libplds4.a
-lib/libplds4.so
+lib/libnspr4.${SO_SUFFIX}
+lib/libplc4.${SO_SUFFIX}
+lib/libplds4.${SO_SUFFIX}
 @dirrm include/nspr/private
 @dirrm include/nspr/obsolete
 @dirrm include/nspr/md
diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/buildlink3.mk  Tue Jan 25 14:50:38 2005 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+NSPR_BUILDLINK3_MK:=   ${NSPR_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    nspr
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nnspr}
+BUILDLINK_PACKAGES+=   nspr
+
+.if !empty(NSPR_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.nspr+=       nspr>=4.4.1
+BUILDLINK_RECOMMENDED.nspr+=   nspr>=4.4.1
+BUILDLINK_PKGSRCDIR.nspr?=     ../../devel/nspr
+.endif  # NSPR_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/distinfo
--- a/devel/nspr/distinfo       Tue Jan 25 14:36:38 2005 +0000
+++ b/devel/nspr/distinfo       Tue Jan 25 14:50:38 2005 +0000
@@ -1,4 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/24 19:40:59 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2005/01/25 14:50:39 jschauma Exp $
+
+SHA1 (nspr-4.4.1.tar.gz) = f709b7941c8f28508293541a8578ed4b625adeaf
+Size (nspr-4.4.1.tar.gz) = 1324075 bytes
 
-SHA1 (nspr-4.3.tar.gz) = 2aacb9f16ebdba94e829c2272db979e7df5f9f52
-Size (nspr-4.3.tar.gz) = 1318016 bytes
+SHA1 (patch-aa) = 41cf591b7553175cd5f60a1f30fb5659bab8af8f
+SHA1 (patch-ab) = 80d88458a1209f9b0fd79b1cffad168cdb6e6c71
+SHA1 (patch-ac) = aa551173541bb651dd573120dfeb516e6f28612b
+SHA1 (patch-ad) = 4945ca7de73bf3294e369607a06b59bdab00653c
+SHA1 (patch-ae) = f09efe0defd526eaedf736d9c3df3bdd2a2600b8
+SHA1 (patch-af) = b8b09a97b026905418b7bcd6cd6434f6665586c4
diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-aa       Tue Jan 25 14:50:38 2005 +0000
@@ -0,0 +1,125 @@
+$NetBSD: patch-aa,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+
+--- ../pr/include/md/_netbsd.cfg.orig  2000-12-02 06:29:17.000000000 +0900
++++ ../pr/include/md/_netbsd.cfg       2004-06-10 23:06:59.000000000 +0900
+@@ -45,7 +45,8 @@
+ 
+ #define PR_AF_INET6 24  /* same as AF_INET6 */
+ 
+-#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
++#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
++      defined(__MIPSEL__)
+ 
+ #define IS_LITTLE_ENDIAN 1
+ #undef  IS_BIG_ENDIAN
+@@ -91,7 +92,53 @@
+ #define PR_ALIGN_OF_DOUBLE  4
+ #define PR_ALIGN_OF_POINTER 4
+ 
+-#elif defined(__sparc__) || defined(__MIPSEB__)
++#elif defined(__sparc_v9__)
++
++#undef IS_LITTLE_ENDIAN
++#define  IS_BIG_ENDIAN 1
++#define HAVE_LONG_LONG
++#define  HAVE_ALIGNED_DOUBLES
++#define  HAVE_ALIGNED_LONGLONGS
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++#define PR_BYTES_PER_WORD_LOG2   3
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8 
++#define PR_ALIGN_OF_FLOAT   4 
++#define PR_ALIGN_OF_DOUBLE  8 
++#define PR_ALIGN_OF_POINTER 8 
++
++#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
+ 
+ #undef IS_LITTLE_ENDIAN
+ #define  IS_BIG_ENDIAN 1
+@@ -184,6 +231,55 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__amd64__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
+ #elif defined(__powerpc__) || defined(__m68k__)
+ 
+ #undef  IS_LITTLE_ENDIAN
diff -r e89f696cfba1 -r eab50d03eb15 devel/nspr/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nspr/patches/patch-ab       Tue Jan 25 14:50:38 2005 +0000
@@ -0,0 +1,72 @@
+$NetBSD: patch-ab,v 1.1 2005/01/25 14:50:39 jschauma Exp $
+
+--- ../pr/include/md/_netbsd.h.orig    2003-09-12 02:24:53.000000000 +0900
++++ ../pr/include/md/_netbsd.h 2004-06-10 23:07:02.000000000 +0900
+@@ -44,16 +44,26 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__powerpc__)
+ #define _PR_SI_ARCHITECTURE "powerpc"
++#elif defined(__sparc_v9__)
++#define _PR_SI_ARCHITECTURE "sparc64"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__mips__)
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/nspr merge PLIST, too
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/evolution apply a patch from evution CVS:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/nspr merge PLIST, too
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/evolution apply a patch from evution CVS:
Indexes:
Home | Main Index | Thread Index | Old Index