update Fri Jan 8 12:37:00 PST 2010
authorCharlie <root@crater.dragonflybsd.org>
Fri, 8 Jan 2010 20:47:33 +0000 (12:47 -0800)
committerCharlie <root@crater.dragonflybsd.org>
Fri, 8 Jan 2010 20:47:33 +0000 (12:47 -0800)
23 files changed:
databases/gq/distinfo
databases/gq/patches/patch-ae [new file with mode: 0644]
graphics/ivtools/distinfo
graphics/ivtools/patches/patch-bd [new file with mode: 0644]
ham/gmfsk/Makefile
inputmethod/imhangul_status_applet/distinfo
inputmethod/imhangul_status_applet/patches/patch-ab [new file with mode: 0644]
inputmethod/imhangul_status_applet/patches/patch-ac [new file with mode: 0644]
lang/gpc/Makefile
multimedia/handbrake/Makefile
multimedia/totem-nautilus/Makefile
sysutils/cdrkit/Makefile
sysutils/gpart/distinfo
sysutils/gpart/patches/patch-af [new file with mode: 0644]
textproc/harmony/Makefile
textproc/isearch/Makefile
wip/libvdpau/DESCR [new file with mode: 0644]
wip/libvdpau/Makefile [new file with mode: 0644]
wip/libvdpau/PLIST [new file with mode: 0644]
wip/libvdpau/distinfo [new file with mode: 0644]
wip/xulrunner/Makefile
wip/xulrunner/PLIST
www/jakarta-tomcat5/Makefile

index bcbaa5b..62b636d 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2008/01/10 21:42:51 adam Exp $
+$NetBSD: distinfo,v 1.10 2010/01/08 17:21:19 joerg Exp $
 
 SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
 RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = b243ab8d862e1aae6dc3a1e4769faa8e8949efe6
 SHA1 (patch-ab) = aa4918c9ee9900b839c58692e68c4adb675dcb17
 SHA1 (patch-ac) = d2180a16425a672c93c19697d9648e4c552cdcb8
 SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
+SHA1 (patch-ae) = aeda3e38a58b8211b8df2534409d928766078287
 SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
diff --git a/databases/gq/patches/patch-ae b/databases/gq/patches/patch-ae
new file mode 100644 (file)
index 0000000..631b9d3
--- /dev/null
@@ -0,0 +1,62 @@
+$NetBSD: patch-ae,v 1.3 2010/01/08 17:21:19 joerg Exp $
+
+--- src/gq-hash-openssl.c.orig 2007-05-14 16:26:50.000000000 +0000
++++ src/gq-hash-openssl.c
+@@ -60,7 +60,7 @@ gq_hash_crypt(gchar const *data, gsize l
+      salt->str[2] = 0;
+      g_byte_array_append(gb, (guchar*)"{CRYPT}", 7);
+-     des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
++     DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
+      g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf));
+@@ -242,7 +242,7 @@ static const char *lmhash_key = "KGS!@#$
+ /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be
+    handled by toupper) */
+-static void lm_make_key(const char *pw, des_cblock *key)
++static void lm_make_key(const char *pw, DES_cblock *key)
+ {
+      int i;
+      char *k = (char *) key;
+@@ -253,7 +253,7 @@ static void lm_make_key(const char *pw, 
+         k[i+1]  = (pw[i] << (7 - i)) & 0xff;
+      }
+-     des_set_odd_parity(key);
++     DES_set_odd_parity(key);
+ }
+ GByteArray*
+@@ -262,10 +262,10 @@ gq_hash_lmhash(gchar const* data, gsize 
+      unsigned int i;
+      char hex[2];
+      char plain[15];
+-     des_key_schedule schedule;
++     DES_key_schedule schedule;
+      GByteArray *gb = NULL;
+-     des_cblock ckey1, ckey2;
+-     des_cblock bin1,  bin2;
++     DES_cblock ckey1, ckey2;
++     DES_cblock bin1,  bin2;
+      memset(plain, 0, sizeof(plain));
+@@ -274,12 +274,12 @@ gq_hash_lmhash(gchar const* data, gsize 
+      }
+      lm_make_key(plain, &ckey1);
+-     des_set_key_unchecked(&ckey1, schedule);
+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT);
++     DES_set_key_unchecked(&ckey1, &schedule);
++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT);
+      lm_make_key(plain + 7, &ckey2);
+-     des_set_key_unchecked(&ckey2, schedule);
+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT);
++     DES_set_key_unchecked(&ckey2, &schedule);
++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT);
+      gb = g_byte_array_new();
index 96e20c0..2de978c 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2007/06/21 11:55:32 markd Exp $
+$NetBSD: distinfo,v 1.17 2010/01/08 18:46:48 joerg Exp $
 
 SHA1 (ivtools-1.2.4.tgz) = 9c9cbfeedd7692c001b458ce82958428082367a5
 RMD160 (ivtools-1.2.4.tgz) = 88cc853e7a31b56a1968021c86394084ba07a4f4
@@ -32,3 +32,4 @@ SHA1 (patch-az) = ec58b1583cf750031c848d0455250226f3d54d99
 SHA1 (patch-ba) = bcc98482672d9c1642dd108fbecec16627d43345
 SHA1 (patch-bb) = 8221a722579cc8921cd71e9ff8aedbf73a938e0b
 SHA1 (patch-bc) = be65c4c37689880cb66de15efd27ab2fa77d76d0
+SHA1 (patch-bd) = c4cd942bbabf48df7919b83de6a6cef85eb9d2b3
diff --git a/graphics/ivtools/patches/patch-bd b/graphics/ivtools/patches/patch-bd
new file mode 100644 (file)
index 0000000..f8f6e43
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2010/01/08 18:46:48 joerg Exp $
+
+--- src/Attribute/attrvalue.c.orig     2010-01-08 18:22:39.000000000 +0000
++++ src/Attribute/attrvalue.c
+@@ -283,7 +283,7 @@ boolean AttributeValue::boolean_val() {
+     case AttributeValue::StringType:
+       return (boolean) int_val()!=-1;
+     case AttributeValue::ObjectType:
+-      return (boolean) obj_val();
++      return (boolean) (uintptr_t)obj_val();
+     case AttributeValue::StreamType:
+       return stream_mode() != 0;
+     default:
index 33e2d91..3fd2a0d 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.29 2010/01/08 16:56:31 joerg Exp $
 #
 
 DISTNAME=      gmfsk-0.6
@@ -19,6 +19,9 @@ GCONF_SCHEMAS+=gmfsk.schemas
 
 CONFIGURE_ARGS+=--enable-hamlib
 
+.include "../../mk/bsd.prefs.mk"
+LDFLAGS+=      ${LIBOSSAUDIO}
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../math/fftw2/buildlink3.mk"
index 93cec19..9bd59cb 100644 (file)
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/10/17 00:04:02 minskim Exp $
+$NetBSD: distinfo,v 1.4 2010/01/08 18:10:53 joerg Exp $
 
 SHA1 (imhangul_status_applet-0.3.tar.gz) = 7d8f4b2f269191147be43c3d27fdbc326906f430
 RMD160 (imhangul_status_applet-0.3.tar.gz) = a94637cae774e71e8d0c479eeaa767c5facf0600
 Size (imhangul_status_applet-0.3.tar.gz) = 447992 bytes
 SHA1 (patch-aa) = aee4d7244692799f2f11741962fdf0c4d7136674
+SHA1 (patch-ab) = b2b0f5dee21b8d6070f982063a100ac549e2744d
+SHA1 (patch-ac) = 7b496a11e6c22563aab6939621477c79cbb83cd1
diff --git a/inputmethod/imhangul_status_applet/patches/patch-ab b/inputmethod/imhangul_status_applet/patches/patch-ab
new file mode 100644 (file)
index 0000000..ec8eec6
--- /dev/null
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2010/01/08 18:10:53 joerg Exp $
+
+--- configure.orig     2003-10-28 02:30:52.000000000 +0000
++++ configure
+@@ -8798,13 +8798,13 @@ echo "${ECHO_T}yes" >&6
+             echo "$as_me:$LINENO: checking IMHANGUL_STATUS_CFLAGS" >&5
+ echo $ECHO_N "checking IMHANGUL_STATUS_CFLAGS... $ECHO_C" >&6
+-            IMHANGUL_STATUS_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED"`
++            IMHANGUL_STATUS_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED libgnomeui-2.0"`
+             echo "$as_me:$LINENO: result: $IMHANGUL_STATUS_CFLAGS" >&5
+ echo "${ECHO_T}$IMHANGUL_STATUS_CFLAGS" >&6
+             echo "$as_me:$LINENO: checking IMHANGUL_STATUS_LIBS" >&5
+ echo $ECHO_N "checking IMHANGUL_STATUS_LIBS... $ECHO_C" >&6
+-            IMHANGUL_STATUS_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED"`
++            IMHANGUL_STATUS_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED" libgnomeui-2.0`
+             echo "$as_me:$LINENO: result: $IMHANGUL_STATUS_LIBS" >&5
+ echo "${ECHO_T}$IMHANGUL_STATUS_LIBS" >&6
+         else
diff --git a/inputmethod/imhangul_status_applet/patches/patch-ac b/inputmethod/imhangul_status_applet/patches/patch-ac
new file mode 100644 (file)
index 0000000..d4e9c00
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2010/01/08 18:10:53 joerg Exp $
+
+--- src/imhangul_status.c.orig 2010-01-08 18:07:35.000000000 +0000
++++ src/imhangul_status.c
+@@ -28,6 +28,7 @@
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
++#include <libgnome/gnome-program.h>
+ #include <libgnomeui/gnome-about.h>
+ #include <libgnomeui/gnome-window-icon.h>
+ #include <panel-applet.h>
index 736d6b8..c6ae628 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:01:20 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/01/08 17:03:16 joerg Exp $
 
 DISTNAME=              gpc-2.1
 PKGREVISION=           5
@@ -17,7 +17,7 @@ PATCHFILES=           gcc-2.95.3-diff-2002-08-29.gz
 
 BUILD_DEPENDS+=                gsed-[0-9]*:../../textproc/gsed
 
-NOT_FOR_PLATFORM+=     Interix-*-*
+NOT_FOR_PLATFORM+=     Interix-*-* *-*-x86_64
 
 WRKSRC=                        ${WRKDIR}/gcc-2.95.3
 USE_TOOLS+=            gmake
index e5287be..059f399 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:06 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/08 17:33:24 joerg Exp $
 #
 
 DISTNAME=      HandBrake-0.9.3
@@ -46,7 +46,7 @@ NO_SRC_ON_FTP=        ${RESTRICTED}
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake perl intltool msgfmt pkg-config
+USE_TOOLS+=    gmake perl intltool msgfmt pkg-config bash
 USE_TOOLS+=    autoconf automake aclocal autoreconf m4
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
index 5061e34..0dfb220 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/10/21 19:18:31 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/08 15:50:56 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -10,6 +10,7 @@ PKGNAME=      ${DISTNAME:S/totem/totem-nautilus/}
 # override Makefile.common
 PLIST_SRC=      ${.CURDIR}/PLIST
 GCONF_SCHEMAS= # none
+CONFIGURE_ARGS+= --with-plugins=properties
 
 COMMENT+=      (nautilus plugin)
 
index 667ad3e..b9e4220 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/07 22:02:24 hasso Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/08 16:19:18 joerg Exp $
 #
 
 DISTNAME=      cdrkit-1.1.9
@@ -13,12 +13,12 @@ CONFLICTS=  cdrtools-[0-9]*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_TOOLS+=    gmake perl:run
+USE_CMAKE=     yes
+USE_TOOLS+=    perl:run
 USE_LANGUAGES= c c++
-MAKE_FLAGS+=   MANSUBDIR=man
+CMAKE_ARGS+=   -DMANSUBDIR=${PKGMANDIR}
 
 REPLACE_PERL=  3rd-party/dirsplit/dirsplit
 
-.include "../../devel/cmake/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index ea13400..71b2074 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2008/12/26 20:23:45 hasso Exp $
+$NetBSD: distinfo,v 1.7 2010/01/08 17:02:42 joerg Exp $
 
 SHA1 (gpart-0.1h.tar.gz) = 23f66162e1d85977ea43bfe6b5e5bff0ad2d566e
 RMD160 (gpart-0.1h.tar.gz) = 1cdfb1779801ee8755b05975ced24441a3a2b639
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 43fda85fe6b11c00b256682c7184578a985b9397
 SHA1 (patch-ac) = 15a57dd0e9b57c7a64869b43df37a5b2493e77d2
 SHA1 (patch-ad) = e53ca24886c072d514802e7dca7a79da2e1916d0
 SHA1 (patch-ae) = e9126b145ec8995645d79cd5d569da6e882b3c89
+SHA1 (patch-af) = a201375f69b1581259a2bc287d7ce5ab7c7dafe4
diff --git a/sysutils/gpart/patches/patch-af b/sysutils/gpart/patches/patch-af
new file mode 100644 (file)
index 0000000..d7f4815
--- /dev/null
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1 2010/01/08 17:02:42 joerg Exp $
+
+--- src/gm_ntfs.h.orig 2010-01-08 16:59:01.000000000 +0000
++++ src/gm_ntfs.h
+@@ -29,18 +29,11 @@
+ /* 'NTFS' in little endian */
+ #define NTFS_SUPER_MAGIC      0x5346544E
+-#if defined(i386) || defined(__i386__) || defined(__alpha__)
+-
+-/* unsigned integral types */
+-#ifndef NTFS_INTEGRAL_TYPES
+-#define NTFS_INTEGRAL_TYPES
+-typedef unsigned char         ntfs_u8;
+-typedef unsigned short                ntfs_u16;
+-typedef unsigned int          ntfs_u32;
+-typedef s64_t                 ntfs_u64;
+-#endif /* NTFS_INTEGRAL_TYPES */
+-#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
+-
++#include <inttypes.h>
++typedef uint8_t ntfs_u8;
++typedef uint16_t ntfs_u16;
++typedef uint32_t ntfs_u32;
++typedef int64_t ntfs_u64;
+ /* Macros reading unsigned integers from a byte pointer */
+ /* these should work for all little endian machines */
index 9f6c35d..2995bbc 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/25 18:02:01 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/08 17:49:01 joerg Exp $
 #
 
 DISTNAME=      harmony-stable-${VERSION}
@@ -10,6 +10,8 @@ MAINTAINER=   pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://alliance.seas.upenn.edu/~harmony/
 COMMENT=       Generic framework for reconciling disconnected updates to heterogeneous, replicated XML data
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_DEPENDS+=        dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=      ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 DEPENDS+=      equeue-[0-9]*:../../devel/equeue
@@ -23,6 +25,8 @@ USE_TOOLS+=   gmake
 TEX_DEPMETHOD= build
 TEST_TARGET=   test
 
+INSTALLATION_DIRS=     bin share/doc/harmony
+
 do-install:
        for file in src/harmony \
                examples/addresses/harmonize-addresses \
@@ -33,11 +37,10 @@ do-install:
                examples/plist/harmonize-plist \
                examples/relational/harmonize-relational \
                examples/structuredtext/harmonize-structuredtext; do \
-               ${INSTALL_PROGRAM} ${WRKSRC}/$$file ${PREFIX}/bin; \
+               ${INSTALL_PROGRAM} ${WRKSRC}/$$file ${DESTDIR}${PREFIX}/bin; \
        done
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/harmony
-       ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${PREFIX}/share/doc/harmony
-       ${INSTALL_DATA} ${WRKSRC}/doc/main.pdf ${PREFIX}/share/doc/harmony
+       ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
+       ${INSTALL_DATA} ${WRKSRC}/doc/main.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
index 4b7a30d..893644d 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/03 14:28:31 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/08 18:12:11 joerg Exp $
 
 DISTNAME=              Isearch-1.47.01
 PKGNAME=               isearch-1.47.01
@@ -11,6 +11,9 @@ COMMENT=              Advanced text indexing and searching system
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+# Pointer casts are errors in C++
+NOT_FOR_PLATFORM+=     ${LP64PLATFORMS}
+
 MAKE_JOBS_SAFE=                no
 
 GNU_CONFIGURE=         yes
diff --git a/wip/libvdpau/DESCR b/wip/libvdpau/DESCR
new file mode 100644 (file)
index 0000000..b4fc64e
--- /dev/null
@@ -0,0 +1,8 @@
+The Video Decode and Presentation API for Unix (VDPAU) provides a complete
+solution for decoding, post-processing, compositing, and displaying
+compressed or uncompressed video streams. These video streams may be
+combined (composited) with bitmap content, to implement OSDs and other
+application user interfaces.
+
+This VDPAU API allows video programs to offload portions of the video
+decoding process and video post-processing to the GPU video-hardware.
diff --git a/wip/libvdpau/Makefile b/wip/libvdpau/Makefile
new file mode 100644 (file)
index 0000000..0addf82
--- /dev/null
@@ -0,0 +1,29 @@
+# $NetBSD$
+#
+
+DISTNAME=      libvdpau-0.3
+CATEGORIES=    multimedia
+MASTER_SITES=  http://people.freedesktop.org/~aplattner/vdpau/
+
+MAINTAINER=    vle@gmx.net
+HOMEPAGE=      http://http.download.nvidia.com/XFree86/vdpau/doxygen/html/index.html
+COMMENT=       Video Decode and Presentation API for Unix
+#LICENSE=      a la BSD
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_TOOLS+=    pkg-config gmake
+USE_LANGUAGES= c c++
+
+INSTALLATION_DIRS+=    share/doc/libvdpau
+
+PKGCONFIG_OVERRIDE+=   vdpau.pc.in
+
+post-install:
+       set -e; cd ${WRKSRC}; \
+       ${INSTALL_DATA} COPYING AUTHORS ${DESTDIR}${PREFIX}/share/doc/libvdpau
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/libvdpau/PLIST b/wip/libvdpau/PLIST
new file mode 100644 (file)
index 0000000..dcafa91
--- /dev/null
@@ -0,0 +1,8 @@
+@comment $NetBSD$
+include/vdpau/vdpau.h
+include/vdpau/vdpau_x11.h
+lib/libvdpau.la
+lib/pkgconfig/vdpau.pc
+lib/vdpau/libvdpau_trace.la
+share/doc/libvdpau/AUTHORS
+share/doc/libvdpau/COPYING
diff --git a/wip/libvdpau/distinfo b/wip/libvdpau/distinfo
new file mode 100644 (file)
index 0000000..f9a8db0
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (libvdpau-0.3.tar.gz) = e32980329c84dbb90e2954e4a38051618f053ef7
+RMD160 (libvdpau-0.3.tar.gz) = f1e3c97fe7515cf6495407b1b137ea6954fa96db
+Size (libvdpau-0.3.tar.gz) = 449479 bytes
index 5680855..97d6b79 100644 (file)
@@ -33,21 +33,7 @@ pre-configure:
        cd ${WRKSRC}/js/src && autoconf
        cd ${WRKSRC}/nsprpub && autoconf
 
-INCLUDE_SUBDIRS=\
-       caps chardet commandhandler content cookie docshell dom         \
-       downloads embedcomponents exthandler fastfind find gfx          \
-       gtkembedmoz htmlparser imglib2 intl java js layout libreg       \
-       locale loginmgr mimetype necko nkcache nspr oji pipboot pipnss  \
-       places pref profdirserviceprovider rdf shistory spellchecker    \
-       string thebes toolkitcomps uconv uriloader webbrowserpersist    \
-       webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp   \
-       plugin liveconnect
-INCLUDE_SUBDIRS=
 post-install:
-       ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a   \
-         ${DESTDIR}${PREFIX}/lib/xulrunner
-
-post-install_:
        # XXX fix the pkg-config files instead
        rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
        ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a        \
@@ -55,16 +41,8 @@ post-install_:
        rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
        ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a      \
          ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
-.for dir in ${INCLUDE_SUBDIRS}
-       cd ${WRKSRC}/dist/include &&                                    \
-         ${INSTALL_DATA} `find ${dir} -name "*.h" -print`              \
-         ${DESTDIR}${PREFIX}/include/xulrunner/unstable
-.endfor
-       cd ${WRKSRC}/dist/include && ${INSTALL_DATA}                    \
-         js/jsproto.tbl mozilla-config.h gtkembedmoz/gtkmozembed_glue.cpp \
-         ${DESTDIR}${PREFIX}/include/xulrunner/unstable
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/xulrunner/unstable/obsolete
-       cd ${WRKSRC}/dist/include/nspr/obsolete && ${INSTALL_DATA} protypes.h \
-         ${DESTDIR}${PREFIX}/include/xulrunner/unstable/obsolete
+       rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a
+       ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a \
+         ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a
 
 .include "../../mk/bsd.pkg.mk"
index 3911182..7cfb98d 100644 (file)
@@ -2300,6 +2300,8 @@ lib/xulrunner/libsoftokn3.so
 lib/xulrunner/libssl3.so
 lib/xulrunner/libunicharutil_external_s.a
 lib/xulrunner/libxpcom.so
+lib/xulrunner/libxpcomglue.a
+lib/xulrunner/libxpcomglue_s.a
 lib/xulrunner/libxul.so
 lib/xulrunner/modules/CertUtils.jsm
 lib/xulrunner/modules/DownloadLastDir.jsm
index a6bee24..f469bec 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2009/07/07 19:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/08 18:53:12 joerg Exp $
 
 PKGNAME=       jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=      jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www java
 # The list of sites to download is generated by a jakarta website.
 # The getsite.sh script parses the HTML and extracts the urls.
@@ -27,6 +27,8 @@ CATALINA_DIR= Catalina/localhost
 EGDIR=         ${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=                ${EGDIR}/${CATALINA_DIR}
 
+REPLACE_SH+=   bin/contrib/GNU-Linux/catalina.sh
+
 .include "../../mk/bsd.prefs.mk"
 
 # Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)