diff options
author | jschauma <jschauma@pkgsrc.org> | 2005-01-25 14:50:38 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2005-01-25 14:50:38 +0000 |
commit | 523b978750b0756fae58a01092a4aed97f34e883 (patch) | |
tree | ea162a78ee0d76f8dfa3be92abb1b86add396b95 | |
parent | e2486cd5abdd1a8192b05a987f4962901c01ed76 (diff) | |
download | pkgsrc-523b978750b0756fae58a01092a4aed97f34e883.tar.gz |
Merge with / update using the package provided by matthewluckie in
pkgsrc-wip.
-rw-r--r-- | devel/nspr/Makefile | 53 | ||||
-rw-r--r-- | devel/nspr/PLIST | 15 | ||||
-rw-r--r-- | devel/nspr/buildlink3.mk | 19 | ||||
-rw-r--r-- | devel/nspr/distinfo | 13 | ||||
-rw-r--r-- | devel/nspr/patches/patch-aa | 125 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ab | 72 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ac | 22 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ad | 19 | ||||
-rw-r--r-- | devel/nspr/patches/patch-ae | 13 | ||||
-rw-r--r-- | devel/nspr/patches/patch-af | 17 |
10 files changed, 348 insertions, 20 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 766c22fc8a2..ac3ef1e48a6 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -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 -HOMEPAGE= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.3/README +MAINTAINER= mjl@luckie.org.nz +HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html COMMENT= Platform-neutral API for system level and libc like functions -GNU_CONFIGURE= YES +WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build + +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make +GNU_CONFIGURE= YES + +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 @@ do-install: (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 --git a/devel/nspr/PLIST b/devel/nspr/PLIST index 7d3acf6cf92..c7fdd081f44 100644 --- a/devel/nspr/PLIST +++ b/devel/nspr/PLIST @@ -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.cfg 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/prtrace.h 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 --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk new file mode 100644 index 00000000000..43105aec847 --- /dev/null +++ b/devel/nspr/buildlink3.mk @@ -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 --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 530d68b9197..1d3761a354d 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -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.3.tar.gz) = 2aacb9f16ebdba94e829c2272db979e7df5f9f52 -Size (nspr-4.3.tar.gz) = 1318016 bytes +SHA1 (nspr-4.4.1.tar.gz) = f709b7941c8f28508293541a8578ed4b625adeaf +Size (nspr-4.4.1.tar.gz) = 1324075 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 --git a/devel/nspr/patches/patch-aa b/devel/nspr/patches/patch-aa new file mode 100644 index 00000000000..db072a07bfe --- /dev/null +++ b/devel/nspr/patches/patch-aa @@ -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 --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab new file mode 100644 index 00000000000..ba2ba7487d4 --- /dev/null +++ b/devel/nspr/patches/patch-ab @@ -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__) + #define _PR_SI_ARCHITECTURE "mips" + #elif defined(__arm32__) + #define _PR_SI_ARCHITECTURE "arm32" ++#elif defined(__ARMEL__) ++#define _PR_SI_ARCHITECTURE "armel" ++#elif defined(__ARMEL__) ++#define _PR_SI_ARCHITECTURE "armeb" ++#elif defined(__arm__) ++#define _PR_SI_ARCHITECTURE "arm" + #endif + + #if defined(__ELF__) +@@ -86,6 +96,12 @@ + #define _PR_INET6_PROBE + #endif + ++#if __NetBSD_Version__ >= 106370000 ++/* NetBSD 1.6ZK */ ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_GETPROTO_R_INT ++#endif ++ + #define USE_SETJMP + + #ifndef _PR_PTHREADS +@@ -108,7 +124,17 @@ + } + #define _MD_GET_SP(_thread) CONTEXT(_thread)[2] + #endif +-#ifdef __sparc__ ++#ifdef __sparc_v9__ ++#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ ++{ \ ++ sigsetjmp(CONTEXT(_thread), 1); \ ++ CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff); \ ++ CONTEXT(_thread)[2] = (long) _main; \ ++ CONTEXT(_thread)[3] = (long) _main + 4; \ ++ *status = PR_TRUE; \ ++} ++#define _MD_GET_SP(_thread) (CONTEXT(_thread)[2]+0x7ff) ++#elif defined(__sparc__) + #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ + { \ + sigsetjmp(CONTEXT(_thread), 1); \ +@@ -150,7 +176,7 @@ + } + #define _MD_GET_SP(_thread) CONTEXT(_thread)[32] + #endif +-#ifdef __arm32__ ++#ifdef __arm__ + #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ + { \ + sigsetjmp(CONTEXT(_thread), 1); \ diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac new file mode 100644 index 00000000000..4697a712214 --- /dev/null +++ b/devel/nspr/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2005/01/25 14:50:39 jschauma Exp $ + +--- ../configure.in.orig 2004-04-17 07:28:02.000000000 +0900 ++++ ../configure.in 2004-07-27 01:25:32.000000000 +0900 +@@ -933,6 +933,9 @@ + DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' + MDCPUCFG_H=_freebsd.cfg + PR_MD_CSRCS=freebsd.c ++ if test "$LIBRUNPATH"; then ++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH" ++ fi + ;; + + *-hpux*) +@@ -1409,6 +1412,7 @@ + AC_DEFINE(XP_UNIX) + AC_DEFINE(NETBSD) + AC_DEFINE(HAVE_BSD_FLOCK) ++ AC_DEFINE(HAVE_SOCKLEN_T) + USE_NSPR_THREADS=1 + MDCPUCFG_H=_netbsd.cfg + PR_MD_CSRCS=netbsd.c diff --git a/devel/nspr/patches/patch-ad b/devel/nspr/patches/patch-ad new file mode 100644 index 00000000000..ece2b7dc561 --- /dev/null +++ b/devel/nspr/patches/patch-ad @@ -0,0 +1,19 @@ +$NetBSD: patch-ad,v 1.1 2005/01/25 14:50:39 jschauma Exp $ + +--- ../pr/src/io/prprf.c.orig Tue Dec 21 11:15:40 2004 ++++ ../pr/src/io/prprf.c Tue Dec 21 11:29:27 2004 +@@ -51,7 +51,13 @@ + ** Note: on some platforms va_list is defined as an array, + ** and requires array notation. + */ +-#if (defined(LINUX) && defined(__powerpc__)) || \ ++#if (defined(LINUX) && defined(__x86_64__)) ++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) ++#elif (defined (__NetBSD__) && \ ++ (defined(__amd64__) || \ ++ (defined(__powerpc__) && __NetBSD_Version__ >= 105000000))) ++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) ++#elif (defined(LINUX) && defined(__powerpc__)) || \ + (defined(LINUX) && defined(__s390__)) || \ + (defined(LINUX) && defined(__s390x__)) || \ + defined(WIN16) || defined(QNX) || \ diff --git a/devel/nspr/patches/patch-ae b/devel/nspr/patches/patch-ae new file mode 100644 index 00000000000..d8ce73c56c2 --- /dev/null +++ b/devel/nspr/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2005/01/25 14:50:39 jschauma Exp $ + +--- ../pr/src/pthreads/ptio.c.orig Tue Dec 21 11:43:31 2004 ++++ ../pr/src/pthreads/ptio.c Tue Dec 21 11:43:46 2004 +@@ -202,7 +202,7 @@ + #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \ + || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \ + || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \ +- || defined(UNIXWARE) ++ || defined(UNIXWARE) || defined(NETBSD) + #define _PRSockOptVal_t void * + #else + #error "Cannot determine architecture" diff --git a/devel/nspr/patches/patch-af b/devel/nspr/patches/patch-af new file mode 100644 index 00000000000..a9dff879588 --- /dev/null +++ b/devel/nspr/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.1 2005/01/25 14:50:39 jschauma Exp $ + +--- ../pr/src/Makefile.in.orig 2003-05-13 18:23:58.000000000 -0700 ++++ ../pr/src/Makefile.in +@@ -164,6 +164,12 @@ OS_LIBS = -ldl + endif + endif + ++ifeq ($(OS_ARCH),NetBSD) ++ifeq ($(USE_PTHREADS), 1) ++OS_LIBS = -lpthread ++endif ++endif ++ + ifeq ($(OS_ARCH),HP-UX) + ifeq ($(USE_PTHREADS), 1) + ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE))) |