From 4ceab3c0055ed6bdacff399294ff8ef253b99468 Mon Sep 17 00:00:00 2001 From: Charlie Date: Sat, 7 Nov 2009 12:47:25 -0800 Subject: [PATCH] update Sat Nov 7 12:37:00 PST 2009 --- doc/CHANGES-2009 | 6 ++++- doc/TODO | 24 +++++++++++++-------- lang/gcc3-f77/Makefile | 15 ++++++++----- lang/openjdk7/Makefile | 9 +++---- lang/openjdk7/PLIST | 4 +- lang/openjdk7/distinfo | 25 +++++++++++------------ lang/openjdk7/icedtea-extras.mk | 7 +++-- lang/openjdk7/patches/patch-aa | 26 ++++++++++++------------ lang/openjdk7/patches/patch-aq | 28 +++++++++++-------------- lang/openjdk7/patches/patch-bb | 13 ------------ misc/tmux/Makefile | 4 +- misc/tmux/distinfo | 9 +++---- misc/tmux/patches/patch-ad | 13 ------------ multimedia/mplayer-share/distinfo | 3 +- multimedia/mplayer-share/patches/patch-ab | 13 ++++++++++++ security/prelude-correlator/Makefile | 7 ++--- security/prelude-correlator/PLIST | 5 +++- security/prelude-correlator/distinfo | 10 ++++---- security/prelude-correlator/patches/patch-aa | 10 ++++---- wip/TODO | 2 +- www/openjdk7-icedtea-plugin/Makefile | 6 +--- www/openjdk7-icedtea-plugin/distinfo | 8 +++--- 22 files changed, 121 insertions(+), 126 deletions(-) delete mode 100644 lang/openjdk7/patches/patch-bb delete mode 100644 misc/tmux/patches/patch-ad create mode 100644 multimedia/mplayer-share/patches/patch-ab diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009 index bde5c66..246b33d 100644 --- a/doc/CHANGES-2009 +++ b/doc/CHANGES-2009 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2009,v 1.4232 2009/11/07 09:07:47 wiz Exp $ +$NetBSD: CHANGES-2009,v 1.4235 2009/11/07 18:33:05 hasso Exp $ Changes to the packages collection and infrastructure in 2009: @@ -5648,3 +5648,7 @@ Changes to the packages collection and infrastructure in 2009: Added textproc/p5-mobiperl version 0.0.43 [wiz 2009-11-07] Added textproc/epubpreflight version 0.1.0 [wiz 2009-11-07] Updated textproc/epubcheck to 1.0.4 [wiz 2009-11-07] + Updated lang/openjdk7 to 1.7.0.75.20091106 [tnn 2009-11-07] + Updated www/openjdk7-icedtea-plugin to 1.11.0.20091106 [tnn 2009-11-07] + Updated misc/tmux to 1.1 [hasso 2009-11-07] + Updated security/prelude-correlator to 0.9.0beta8 [hasso 2009-11-07] diff --git a/doc/TODO b/doc/TODO index ff6ac82..c7d4ee8 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.8631 2009/11/05 20:38:35 heinz Exp $ +$NetBSD: TODO,v 1.8633 2009/11/07 17:27:25 hasso Exp $ Suggested new packages ====================== @@ -364,6 +364,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ROMBuild-2.13 o RTx-Shredder-0.05 o RealPlayer-11 + o SDL_mixer-1.2.9a o SmartEiffel-2.3 o TeXmacs-1.0.7.2 o TiffIO-130e @@ -464,7 +465,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o boson-0.13 o bouml-4.13.1 o brasero-2.28.2 [GNOME 2.28] - o bugzilla-3.4.2 + o bugzilla-3.5.1 o byacc-20080824 o bzr-2.0.1 o c4-1.10 [schmonz] @@ -513,6 +514,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o cryptopp-5.6.0 o cssc-1.2.0 o cups-1.4.1 + o curl-7.19.7 o cvs2p4-2.5.5 [schmonz] o cvsd-1.0.16 o cygwin_lib-1.5.24.2 @@ -532,7 +534,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ddrescue-1.11 o defendguin-0.0.11 o delegate-9.9.5 - o denemo-0.8.8 + o denemo-0.8.10 o deskbar-applet-2.28.0 [GNOME 2.28] o dhid-5.3 o dia-0.97 @@ -593,6 +595,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o exiftool-7.67 o ezmlm-idx-5.1.2 [schmonz] o ezxml-0.8.6 + o f-spot-0.6.1.5 o f2c-20090102 o faces-1.7.7 o fakeroot-1.6.5 @@ -600,7 +603,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o fdgw-20040609 o festival-1.96 o felt-3.07 - o fetchmail-6.3.12 + o fetchmail-6.3.13 o fetchyahoo-2.13.0 o fillets-ng-0.7.4 o fillets-ng-data-0.7.4 @@ -670,7 +673,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gdm-2.28.1 [GNOME 2.28] o gdsreader-0.3.2 o geany-0.18 - o geda-1.5.4.20090830 o gedit-plugins-2.28.0 [GNOME 2.28] o gentoo-0.15.6 o gettext-0.17 @@ -692,7 +694,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o global-5.7.2 [pkg/39760] o global-5.7.3 o glom-1.10.0 [GNOME 2.26] - o glpk-4.39 + o glpk-4.40 o gnash-0.8.6 o gnet1-1.1.9 o gnetman-20050429 @@ -838,6 +840,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o lapack-3.2.1 o latd-1.21 o latex2rtf-1.9.19 + o lbreakout2-2.6 o lbxproxy-1.0.2 o lcc-4.2 o ldapsdk-6.0.2 @@ -918,7 +921,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o lq-sp-1.3.4.13 o lsh-2.0.3 o lsof-4.81 - o ltris-1.0.12 + o ltris-1.0.13 o luit-1.0.4 o lucy-1.20 o luit-1.0.4 @@ -1052,6 +1055,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o openoffice2-bin-2.4.3 o openoffice3-bin-3.1.1 o openssh-5.3.1 + o openssl-0.9.8l o openttd-0.7.1 o open-vm-tools-2009.10.15.201664 o opera-10.01 @@ -1148,6 +1152,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o puppet-0.25.0 o pure-ftpd-1.0.24 o puzzle-5.2 + o puzzles-8736 o pv-1.1.4 o pwlib-1.11.1 o py-FourSuite-1.0.2 @@ -1161,7 +1166,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o py-ZODB-3.2.10 o py-ZopeInterface-3.3.0 o py-bdb-xml-2.1.8 - o py-bsddb3-4.8.0 + o py-bsddb3-4.8.1 o py-checker-0.8.17 o py-fpconst-0.7.3 o py-game-1.9.1 @@ -1362,6 +1367,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o tgif-4.2.1 o thin-1.0.0 o thoth-0.2.1 + o tiff-3.9.2 o tig-0.14.1 o tile-0.7.4 o tinyproxy-1.7.0 @@ -1397,7 +1403,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o upx-2.90 o uriparser-0.7.5 o userppp-030706 - o vala-0.7.7 + o vala-0.7.8 o valgrind-3.5.0 o varnish-2.0.4 [pkg/41118] o vera-1.17 diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile index 9f2f987..da9ddbf 100644 --- a/lang/gcc3-f77/Makefile +++ b/lang/gcc3-f77/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2006/12/07 11:24:28 markd Exp $ +# $NetBSD: Makefile,v 1.20 2009/11/07 18:03:55 asau Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION} COMMENT= GNU Compiler Collection, v3 - F77 compiler +PKG_DESTDIR_SUPPORT= user-destdir + INFO_FILES= # PLIST INSTLIBS= libf2c/libg2c.la @@ -24,15 +26,16 @@ post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk do-install: - ${INSTALL_PROGRAM_DIR} ${GCC_ARCHDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/gcc/f771 ${GCC_ARCHDIR} - cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + ${INSTALL_PROGRAM_DIR} ${DESTDIR}${GCC_ARCHDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/gcc/f771 ${DESTDIR}${GCC_ARCHDIR} + cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${DESTDIR} \ f77.install-common f77.install-info f77.install-man - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \ + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} DESTDIR=${DESTDIR} \ install-target-libf2c post-install: - ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${GCC_PREFIX}/mk/f77.mk + ${INSTALL_DATA_DIR} ${DESTDIR}${GCC_PREFIX}/mk + ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${DESTDIR}${GCC_PREFIX}/mk/f77.mk # ${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77 .include "../../mk/bsd.pkg.mk" diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 5880f06d..522e3f3 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2009/10/24 13:11:01 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2009/11/07 14:48:49 tnn Exp $ -DISTNAME= openjdk-7-ea-src-b72-17_sep_2009 -PKGNAME= openjdk7-1.7.0.72.20090924 -PKGREVISION= 1 +DISTNAME= openjdk-7-ea-src-b75-30_oct_2009 +PKGNAME= openjdk7-1.7.0.75.20091106 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 @@ -18,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} # diff between distfile and bsd-port branch. To check out, use: # "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/" -PATCHFILES+= jdk-7-bsd-port-72.20090924.diff.bz2 +PATCHFILES+= jdk-7-bsd-port-75.20091106.diff.bz2 PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} CACERTS= cacerts-20091013.tar.bz2 diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST index cb9f475..b88ec67 100644 --- a/lang/openjdk7/PLIST +++ b/lang/openjdk7/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/11/07 14:48:49 tnn Exp $ bin/openjdk7-jar bin/openjdk7-java bin/openjdk7-javac @@ -365,7 +365,7 @@ java/openjdk7/jre/lib/${ARCH}/libnpt.so java/openjdk7/jre/lib/${ARCH}/librmi.so java/openjdk7/jre/lib/${ARCH}/libsaproc.so java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so -java/openjdk7/jre/lib/${ARCH}/libsunecc.so +java/openjdk7/jre/lib/${ARCH}/libsunec.so java/openjdk7/jre/lib/${ARCH}/libunpack.so java/openjdk7/jre/lib/${ARCH}/libverify.so java/openjdk7/jre/lib/${ARCH}/libzip.so diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 376025f..4a11c9a 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2009/10/21 10:35:09 ghen Exp $ +$NetBSD: distinfo,v 1.5 2009/11/07 14:48:49 tnn Exp $ -SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732 -RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6 -Size (openjdk7/175529fae103.tar.bz2) = 4599216 bytes +SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab +RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7 +Size (openjdk7/9eb43c172d5b.tar.bz2) = 4599645 bytes SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483 RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes @@ -27,19 +27,19 @@ Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = 24168404 by SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes -SHA1 (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 9af2b0070b0a3367017c8cddeb48bae770cffbe7 -RMD160 (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 52053be9e0430fa318ef14fbd3b3085d609307b6 -Size (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 547293 bytes -SHA1 (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 5183eae9fb4b1f601736a00bdaa02ed28df1219a -RMD160 (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 8bee2fa131c5d7acbf1a55d974ab76065596dc49 -Size (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 46645162 bytes +SHA1 (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 98a6a5f2c71d34e34260f451aa6ee7d586034ff3 +RMD160 (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 5d8d0c8b90d3c117f0aa9b8534f163c6c5f13afd +Size (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 554491 bytes +SHA1 (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = e8f21410fb046ef5a865c5dfa2253b2199d5dd74 +RMD160 (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = e8e6dbd6274c4f37a3603befd88824861ebd50d7 +Size (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = 61502241 bytes SHA1 (openjdk7/rhino1_7R2.zip) = 3bb380cfb7f6febb87a64b2dee7fa308042f37e4 RMD160 (openjdk7/rhino1_7R2.zip) = 58ae321829ac701e442bfbfed3d6f87b2bb6ba4c Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes SHA1 (openjdk7/xalan-j_2_7_1-bin.zip) = 681f04e180de88264bd3df68946001efb0bc2ff1 RMD160 (openjdk7/xalan-j_2_7_1-bin.zip) = d7174fcc9dd8b3876b5a9c8cde021953475b57f8 Size (openjdk7/xalan-j_2_7_1-bin.zip) = 17336979 bytes -SHA1 (patch-aa) = 6cc7d152038414b6bfe6b809e569669836af1587 +SHA1 (patch-aa) = c11951d2957f24352ddedada9ef4edc72e7b7382 SHA1 (patch-ab) = 001f676c0232f76ff49ac3ec248f696af1e2397b SHA1 (patch-ac) = 7e6c0fcfe0b9eaa756eba361d8f9b35d08d17111 SHA1 (patch-ad) = 88950e3d6792a18dd2e2349fee2b7b4c0d822ea4 @@ -53,14 +53,13 @@ SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1 SHA1 (patch-ap) = 4219c2eb348603ee7ebcfad0b3e6dca81b942c91 -SHA1 (patch-aq) = 4cd70c3451eef29d21d1d562cb5f29fbf639631c +SHA1 (patch-aq) = 17be1ad20f0930ad53e0de197fd01f10284cbb5d SHA1 (patch-ar) = 19abc4c858c730fb337d68d1d524db82c73ffa36 SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f SHA1 (patch-at) = 3b6c2268747c62f0008f67e8f3d5478e1905c551 SHA1 (patch-au) = ba3414e924ffd82ca75ae1f8df507753141f2491 SHA1 (patch-av) = be5bb72a3dd251f2a2822f7a1bea3b461b38d016 SHA1 (patch-ba) = 2c56f89ea6297689fec7a7620f64ced752ed34c6 -SHA1 (patch-bb) = cd6b792bd42644da36c7fe1c4abc79f94e2295fc SHA1 (patch-bc) = 301ba93a42ff228254ecb3c9748aa2555dfd601d SHA1 (patch-bd) = 8dc567964e0e47e091043936af540fad6e067583 SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk index df9b95b..fb10d02 100644 --- a/lang/openjdk7/icedtea-extras.mk +++ b/lang/openjdk7/icedtea-extras.mk @@ -1,12 +1,12 @@ -# $NetBSD: icedtea-extras.mk,v 1.2 2009/10/14 16:50:29 tnn Exp $ +# $NetBSD: icedtea-extras.mk,v 1.3 2009/11/07 14:48:49 tnn Exp $ # Needed to extract icedtea EXTRACT_USING= gtar DIST_SUBDIR= openjdk7 -ICEDTEA= icedtea-175529fae103 -ICEDTEA_TGZ= 175529fae103.tar.bz2 +ICEDTEA= icedtea-9eb43c172d5b +ICEDTEA_TGZ= 9eb43c172d5b.tar.bz2 SITES.${ICEDTEA_TGZ}= http://icedtea.classpath.org/hg/icedtea/archive/ DISTFILES+= ${ICEDTEA_TGZ} EXTRACT_ONLY+= ${ICEDTEA_TGZ} @@ -44,6 +44,7 @@ CONFIGURE_ARGS+= --with-jdk-home=${PREFIX}/java/openjdk7 USE_LANGUAGES= c c++ USE_TOOLS+= gawk pkg-config autoconf automake +BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip CONFIGURE_ENV+= ac_cv_path_MD5SUM=/usr/bin/true CONFIGURE_ENV+= ac_cv_path_WGET=/usr/bin/true diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa index 2fa3a09..950c3b7 100644 --- a/lang/openjdk7/patches/patch-aa +++ b/lang/openjdk7/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $ +$NetBSD: patch-aa,v 1.3 2009/11/07 14:48:50 tnn Exp $ ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2009-10-17 16:49:37.000000000 +0200 +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2009-11-07 14:25:33.000000000 +0100 +++ hotspot/src/os/bsd/vm/os_bsd.cpp @@ -63,7 +63,7 @@ # include @@ -11,17 +11,17 @@ $NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $ # include #endif -@@ -2013,6 +2013,9 @@ bool _print_ascii_file(const char* filen - return true; - } - -+#if defined(__NetBSD__) && defined(RTLD_DI_LINKMAP) -+typedef struct link_map Link_map; +@@ -1921,7 +1921,9 @@ void * os::dll_load(const char *filename + {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, + {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, + {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, ++#if 0 + {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, +#endif - void os::print_dll_info(outputStream *st) { - st->print_cr("Dynamic libraries:"); - #ifdef _ALLBSD_SOURCE -@@ -3251,7 +3254,7 @@ OSReturn os::set_native_priority(Thread* + {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, + {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, + {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, +@@ -3278,7 +3280,7 @@ OSReturn os::set_native_priority(Thread* #ifdef __OpenBSD__ // OpenBSD pthread_setprio starves low priority threads return OS_OK; @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $ int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); #elif defined(__APPLE__) || defined(__NetBSD__) struct sched_param sp; -@@ -3279,7 +3282,7 @@ OSReturn os::get_native_priority(const T +@@ -3306,7 +3308,7 @@ OSReturn os::get_native_priority(const T } errno = 0; diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq index 5c9a9a7..a9638cd 100644 --- a/lang/openjdk7/patches/patch-aq +++ b/lang/openjdk7/patches/patch-aq @@ -1,17 +1,13 @@ -$NetBSD: patch-aq,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $ +$NetBSD: patch-aq,v 1.2 2009/11/07 14:48:50 tnn Exp $ ---- jdk/src/share/classes/sun/font/FontManager.java.orig 2008-12-19 09:45:40.000000000 +0100 -+++ jdk/src/share/classes/sun/font/FontManager.java -@@ -3410,6 +3410,12 @@ public final class FontManager { - info[1] = info[1] + File.separator + "arial.ttf"; - } else { - initFontConfigFonts(false); -+ if (fontConfigFonts == null) { -+ info[0] = "nonexistent"; -+ info[1] = "/nonexistent.ttf"; -+ defaultPlatformFont = info; -+ return defaultPlatformFont; -+ } - for (int i=0; i= 0) { - os = "NetBSD"; -+ } else if (os.indexOf("DragonFly") >= 0) { -+ os = "DragonFly"; - } else if (os.indexOf("OpenBSD") >= 0) { - os = "OpenBSD"; - } diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index 414b4cc..23d2494 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2009/09/21 10:55:35 hasso Exp $ +# $NetBSD: Makefile,v 1.7 2009/11/07 17:25:08 hasso Exp $ -DISTNAME= tmux-1.0 +DISTNAME= tmux-1.1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index 3cc9c79..5c8607f 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.8 2009/09/25 16:38:22 hasso Exp $ +$NetBSD: distinfo,v 1.9 2009/11/07 17:25:08 hasso Exp $ -SHA1 (tmux-1.0.tar.gz) = 62bbea17e54cdacb48442e25eddf0463ab69ba61 -RMD160 (tmux-1.0.tar.gz) = 3176447bf21dd1d5559d256ee3786d13771c20af -Size (tmux-1.0.tar.gz) = 215329 bytes +SHA1 (tmux-1.1.tar.gz) = 8dc57a70605930bbe61664bd52ed2c8081ea5a1c +RMD160 (tmux-1.1.tar.gz) = 9f03922c0be46e9259202ed2fdc0834dcf01581c +Size (tmux-1.1.tar.gz) = 230955 bytes SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047 SHA1 (patch-ab) = 0f701c350d26b2b14c230f148ea141ecafec6c6d SHA1 (patch-ac) = e308390602756b03197715de648710ea6441f348 -SHA1 (patch-ad) = 1f325dcb1fdaed1e5c502edd3622189407754571 diff --git a/misc/tmux/patches/patch-ad b/misc/tmux/patches/patch-ad deleted file mode 100644 index 7ac5df8..0000000 --- a/misc/tmux/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2009/09/25 16:38:22 hasso Exp $ - ---- osdep-netbsd.c.orig 2009-09-24 15:58:45.000000000 +0200 -+++ osdep-netbsd.c -@@ -77,7 +77,7 @@ osdep_get_name(int fd, __unused char *tt - return (NULL); - - buf = NULL; -- len = sizeof(p); -+ len = sizeof(bestp); - mib[0] = CTL_KERN; - mib[1] = KERN_PROC2; - mib[2] = KERN_PROC_PGRP; diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 08d85ff..9bc881f 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.64 2009/10/19 00:13:07 ahoka Exp $ +$NetBSD: distinfo,v 1.65 2009/11/07 18:43:36 hasso Exp $ SHA1 (mplayer/mplayer-20091017.tar.bz2) = 8ee97842812b9867f192f521b96bb1b6e1742a23 RMD160 (mplayer/mplayer-20091017.tar.bz2) = 015d3847b05f4d674d4740e55f117ce6085d5cc3 Size (mplayer/mplayer-20091017.tar.bz2) = 8525942 bytes SHA1 (patch-aa) = 24007024e4b6bfa212817681e8d07cc079aee13b +SHA1 (patch-ab) = 821711bc431a4ad6e73b9e4acc6a3311395e1894 SHA1 (patch-ac) = 13ea17bcdde5ebc7e04eeb5eb833dca0cd623ba2 SHA1 (patch-ad) = 0a43a47538f0f18f8b6aa230367821b8bb51e932 SHA1 (patch-ae) = 5a1f1d9f6480fb67a2a12d9088990ed546e1b1e4 diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab new file mode 100644 index 0000000..3935364 --- /dev/null +++ b/multimedia/mplayer-share/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.8 2009/11/07 18:43:37 hasso Exp $ + +--- libdvdread4/bswap.h.orig ++++ libdvdread4/bswap.h +@@ -61,7 +61,7 @@ + #define B2N_32(x) x = swap32(x) + #define B2N_64(x) x = swap64(x) + +-#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++#elif (defined(__FreeBSD__) && __FreeBSD_version >= 470000) || defined(__DragonFly__) + #include + #define B2N_16(x) x = be16toh(x) + #define B2N_32(x) x = be32toh(x) diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile index 9f6f1bb..2339141 100644 --- a/security/prelude-correlator/Makefile +++ b/security/prelude-correlator/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/10/02 10:15:10 hasso Exp $ +# $NetBSD: Makefile,v 1.5 2009/11/07 18:30:28 hasso Exp $ # -DISTNAME= prelude-correlator-0.9.0-beta6 -PKGREVISION= 1 +DISTNAME= prelude-correlator-0.9.0-beta8 PKGNAME= prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//} CATEGORIES= security MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-correlator/ @@ -52,7 +51,7 @@ REQD_DIRS_PERMS+= ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 0700 REPLACE_PYTHON= ${WRKSRC}/*.py -EGG_NAME= prelude_correlator-0.9.0_beta6 +EGG_NAME= prelude_correlator-0.9.0_beta8 pre-patch: ${CP} ${FILESDIR}/run-prelude-correlator.c ${WRKSRC} diff --git a/security/prelude-correlator/PLIST b/security/prelude-correlator/PLIST index bf0e71d..6f81a28 100644 --- a/security/prelude-correlator/PLIST +++ b/security/prelude-correlator/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/10/02 10:15:10 hasso Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/11/07 18:30:29 hasso Exp $ bin/prelude-correlator sbin/run-prelude-correlator ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO @@ -49,6 +49,9 @@ ${PYSITELIB}/PreludeCorrelator/plugins/opensshauth.pyo ${PYSITELIB}/PreludeCorrelator/plugins/scan.py ${PYSITELIB}/PreludeCorrelator/plugins/scan.pyc ${PYSITELIB}/PreludeCorrelator/plugins/scan.pyo +${PYSITELIB}/PreludeCorrelator/plugins/spamhausdrop.py +${PYSITELIB}/PreludeCorrelator/plugins/spamhausdrop.pyc +${PYSITELIB}/PreludeCorrelator/plugins/spamhausdrop.pyo ${PYSITELIB}/PreludeCorrelator/plugins/worm.py ${PYSITELIB}/PreludeCorrelator/plugins/worm.pyc ${PYSITELIB}/PreludeCorrelator/plugins/worm.pyo diff --git a/security/prelude-correlator/distinfo b/security/prelude-correlator/distinfo index f2a1dad..8c00da6 100644 --- a/security/prelude-correlator/distinfo +++ b/security/prelude-correlator/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2009/10/02 10:15:10 hasso Exp $ +$NetBSD: distinfo,v 1.4 2009/11/07 18:30:29 hasso Exp $ -SHA1 (prelude-correlator-0.9.0-beta6.tar.gz) = b75784b69e4a28dc71c836633826e98f1b28da55 -RMD160 (prelude-correlator-0.9.0-beta6.tar.gz) = e64a07fb347c41d9791b0c5cbf0219d7cac0e762 -Size (prelude-correlator-0.9.0-beta6.tar.gz) = 193664 bytes -SHA1 (patch-aa) = 18f7f4e9fcf25b2ab86db3adf18928af239e3b30 +SHA1 (prelude-correlator-0.9.0-beta8.tar.gz) = 962f3c899ed01b9a0efc1368687d6a914e176c73 +RMD160 (prelude-correlator-0.9.0-beta8.tar.gz) = 9ed8e35357ba1bbe6a09c6cb906df28d4f84e347 +Size (prelude-correlator-0.9.0-beta8.tar.gz) = 179713 bytes +SHA1 (patch-aa) = 67b5e6d65044dc30528c08a3e331ddd4a90667ba diff --git a/security/prelude-correlator/patches/patch-aa b/security/prelude-correlator/patches/patch-aa index 30d5f24..5c820ea 100644 --- a/security/prelude-correlator/patches/patch-aa +++ b/security/prelude-correlator/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $ +$NetBSD: patch-aa,v 1.4 2009/11/07 18:30:29 hasso Exp $ --- setup.py.orig 2009-07-09 18:55:53 +0300 +++ setup.py 2009-09-30 09:58:19 +0300 @@ -6,9 +6,9 @@ $NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $ root = self.root or "" for dir, files in data_files: -- dir = os.path.abspath(os.path.join(root, prefix, dir)) +- dir = os.path.abspath(root + os.sep + os.path.join(prefix, dir)) + if dir != "@PRELUDE_HOME@": -+ dir = os.path.abspath(os.path.join(root, prefix, dir)) ++ dir = os.path.abspath(root + os.sep + os.path.join(prefix, dir)) self.mkpath(dir) for f in files: @@ -26,8 +26,8 @@ $NetBSD: patch-aa,v 1.3 2009/10/02 10:15:10 hasso Exp $ else: package_data = {} - data_files = [ ("etc/prelude-correlator", ["prelude-correlator.conf"]), -- ("var/lib/prelude-correlator", ["PreludeCorrelator/plugins/dshield.dat"]) ] -+ data_files = [ ("@PRELUDE_HOME@", ["PreludeCorrelator/plugins/dshield.dat"]) ] +- ("var/lib/prelude-correlator", ["PreludeCorrelator/plugins/dshield.dat", "PreludeCorrelator/plugins/spamhaus_drop.dat"]) ] ++ data_files = [ ("@PRELUDE_HOME@", ["PreludeCorrelator/plugins/dshield.dat", "PreludeCorrelator/plugins/spamhaus_drop.dat"]) ] setup( name="prelude-correlator", diff --git a/wip/TODO b/wip/TODO index 80c5037..0075c0b 100644 --- a/wip/TODO +++ b/wip/TODO @@ -54,7 +54,7 @@ Suggested package updates o llvm-2.6 o man-1.6f o mcabber-0.9.10 - o meta-tracker-0.7.5 + o meta-tracker-0.7.6 o mixxx-1.7.0 o moe-1.3 o mpich2-1.1 diff --git a/www/openjdk7-icedtea-plugin/Makefile b/www/openjdk7-icedtea-plugin/Makefile index 6ac9aec..6d069a2 100644 --- a/www/openjdk7-icedtea-plugin/Makefile +++ b/www/openjdk7-icedtea-plugin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2009/10/27 08:09:10 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2009/11/07 14:49:33 tnn Exp $ # DISTNAME= # from icedtea-extras.mk -PKGNAME= openjdk7-icedtea-plugin-1.11.0.20091005 +PKGNAME= openjdk7-icedtea-plugin-1.11.0.20091106 CATEGORIES= www MASTER_SITES= # from icedtea-extras.mk @@ -11,8 +11,6 @@ HOMEPAGE= http://icedtea.classpath.org/ COMMENT= Java browser plugin #LICENSE= # GPL2 + Classpath exception -BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip - PKG_DESTDIR_SUPPORT= user-destdir ICEDTEA_PACKAGE= yes diff --git a/www/openjdk7-icedtea-plugin/distinfo b/www/openjdk7-icedtea-plugin/distinfo index 7d2cd57..f326b87 100644 --- a/www/openjdk7-icedtea-plugin/distinfo +++ b/www/openjdk7-icedtea-plugin/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2009/10/14 12:36:12 tnn Exp $ +$NetBSD: distinfo,v 1.3 2009/11/07 14:49:33 tnn Exp $ -SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732 -RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6 -Size (openjdk7/175529fae103.tar.bz2) = 4599216 bytes +SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab +RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7 +Size (openjdk7/9eb43c172d5b.tar.bz2) = 4599645 bytes SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483 RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes -- 1.7.7.2