update Wed Dec 30 18:37:00 PST 2009
authorCharlie <root@crater.dragonflybsd.org>
Thu, 31 Dec 2009 02:47:23 +0000 (18:47 -0800)
committerCharlie <root@crater.dragonflybsd.org>
Thu, 31 Dec 2009 02:47:23 +0000 (18:47 -0800)
34 files changed:
doc/CHANGES-2009
ham/gnuradio-core/Makefile
ham/gnuradio-core/PLIST
meta-pkgs/gnuradio/distinfo
meta-pkgs/gnuradio/patches/patch-ae [new file with mode: 0644]
pkgtools/bootstrap-mk-files/files/bsd.README
pkgtools/pbulk/Makefile
pkgtools/pbulk/files/pbulk/scripts/scan
textproc/dict-server/MESSAGE [new file with mode: 0644]
textproc/dict-server/Makefile.common [new file with mode: 0644]
wip/deforaos-libdesktop/DESCR [new file with mode: 0644]
wip/deforaos-libdesktop/Makefile [new file with mode: 0644]
wip/deforaos-libdesktop/PLIST [new file with mode: 0644]
wip/deforaos-libdesktop/buildlink3.mk [new file with mode: 0644]
wip/deforaos-libdesktop/distinfo [new file with mode: 0644]
wip/deforaos-mixer/DESCR [new file with mode: 0644]
wip/deforaos-mixer/Makefile [new file with mode: 0644]
wip/deforaos-mixer/PLIST [new file with mode: 0644]
wip/deforaos-mixer/distinfo [new file with mode: 0644]
wip/grub2-current/distinfo
wip/grub2-current/patches/patch-10_linux-gettext [moved from wip/grub2-current/patches/patch-ah with 100% similarity]
wip/grub2-current/patches/patch-aa [deleted file]
wip/grub2-current/patches/patch-ae [deleted file]
wip/grub2-current/patches/patch-af [deleted file]
wip/grub2-current/patches/patch-ag [deleted file]
wip/grub2-current/patches/patch-configure-LDFLAGS_AC [new file with mode: 0644]
wip/grub2-current/patches/patch-macroify-DEFAULT_DIRECTORY [new file with mode: 0644]
www/Makefile
www/seamonkey-bin-nightly/DESCR [deleted file]
www/seamonkey-bin-nightly/Makefile [deleted file]
www/seamonkey-bin-nightly/Makefile.common [deleted file]
www/seamonkey-bin-nightly/Makefile.linux-i386 [deleted file]
www/seamonkey-bin-nightly/Makefile.solaris-i386 [deleted file]
www/seamonkey-bin-nightly/Makefile.solaris-sparc [deleted file]

index 81f087d..899a6bf 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.4704 2009/12/30 17:11:28 tron Exp $
+$NetBSD: CHANGES-2009,v 1.4705 2009/12/30 21:07:56 joerg Exp $
 
 [PLEASE NOTE - NO INFRASTRUCTURE CHANGES OR NEW PACKAGES, PLEASE,
 PKGSRC IS BEING READIED FOR THE PKGSRC-2009Q4 BRANCH - agc]
@@ -6366,3 +6366,4 @@ Changes to the packages collection and infrastructure in 2009:
        Updated www/typolight27-translations to 20091228 [taca 2009-12-30]
        Updated www/typolight28-translations to 20091228 [taca 2009-12-30]
        Updated pkgtools/x11-links to 0.45 [tron 2009-12-30]
+       Removed www/seamonkey-bin-nightly [joerg 2009-12-30]
index ff0c985..5651a94 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/09/11 16:23:28 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/12/30 21:13:15 joerg Exp $
 
 PKGNAME=        gnuradio-core-${VERSION}
+PKGREVISION=   1
 COMMENT=       Runtime system and DSP blocks for GNU Radio
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index d7392a1..860e0a4 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/08/12 12:21:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/12/30 21:13:15 joerg Exp $
 include/gnuradio/ccomplex_dotprod_generic.h
 include/gnuradio/ccomplex_dotprod_x86.h
 include/gnuradio/complex_dotprod_generic.h
@@ -974,9 +974,6 @@ ${PYSITELIB}/gnuradio/optfir.pyo
 ${PYSITELIB}/gnuradio/packet_utils.py
 ${PYSITELIB}/gnuradio/packet_utils.pyc
 ${PYSITELIB}/gnuradio/packet_utils.pyo
-${PYSITELIB}/gnuradio/vocoder/__init__.py
-${PYSITELIB}/gnuradio/vocoder/__init__.pyc
-${PYSITELIB}/gnuradio/vocoder/__init__.pyo
 ${PYSITELIB}/gnuradio/window.py
 ${PYSITELIB}/gnuradio/window.pyc
 ${PYSITELIB}/gnuradio/window.pyo
index cbbd329..b7ae0c6 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2009/09/11 16:23:31 joerg Exp $
+$NetBSD: distinfo,v 1.2 2009/12/30 21:13:15 joerg Exp $
 
 SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
 RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1
 SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c
 SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
 SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50
+SHA1 (patch-ae) = 0e5211736ffa70edd704b10fce2d8d3943c552c2
diff --git a/meta-pkgs/gnuradio/patches/patch-ae b/meta-pkgs/gnuradio/patches/patch-ae
new file mode 100644 (file)
index 0000000..2481d1a
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/12/30 21:13:15 joerg Exp $
+
+--- gnuradio-core/src/python/gnuradio/Makefile.am.orig 2009-12-23 19:51:56.000000000 +0000
++++ gnuradio-core/src/python/gnuradio/Makefile.am
+@@ -21,7 +21,7 @@
+ include $(top_srcdir)/Makefile.common
+-SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
++SUBDIRS = gr gru gruimpl blks2 blks2impl
+ grpython_PYTHON =                     \
+       __init__.py                     \
index bd4694a..0f774e0 100644 (file)
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.1.1.1 2006/07/14 23:13:00 jlam Exp $
+#      $NetBSD: bsd.README,v 1.2 2009/12/30 20:46:22 abs Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the new make "include" files for the BSD
@@ -550,7 +550,7 @@ WFORMAT     -Wnetbsd-format-audit for extra-stringent format checking.
                mk.conf if you're doing format-string auditing. 
                FORMAT_AUDIT may go away in time.
 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-=-=-=-=   bsd.lib.mk   =-=-=-=-=
 
 The include file <bsd.lib.mk> has support for building libraries.  It has
 the same eight targets as <bsd.prog.mk>: all, clean, cleandir, depend,
@@ -565,6 +565,10 @@ LIB                The name of the library to build.
 
 LIBDIR         Target directory for libraries.
 
+SHLIB_MAJOR
+SHLIB_MINOR
+SHLIB_TEENY    Major, minor, and teeny version numbers of shared library
+
 LINTLIBDIR     Target directory for lint libraries.
 
 LIBGRP         Library group.
index 6dde690..a8ad5aa 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2009/12/16 19:41:41 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2009/12/30 21:14:43 joerg Exp $
 
-DISTNAME=      pbulk-0.43
+DISTNAME=      pbulk-0.44
 COMMENT=       Modular bulk build framework
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index 80ebd3f..e5e9ec4 100755 (executable)
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan,v 1.5 2009/12/16 19:41:41 joerg Exp $
+# $NetBSD: scan,v 1.6 2009/12/30 21:14:43 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -47,7 +47,6 @@ if [ -z "${limited_list}" ]; then
                ${pscan} -v -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr
                ;;
        [yY][eE][sS])
-               ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan
                ${pscan} -v -I ${pscan_start_script} -m ${master_port_scan} -M ${make} ${pkgsrc} ${loc}/pscan 2>> ${loc}/pscan.stderr
                ;;
        *)
diff --git a/textproc/dict-server/MESSAGE b/textproc/dict-server/MESSAGE
new file mode 100644 (file)
index 0000000..c7fa008
--- /dev/null
@@ -0,0 +1,17 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2009/12/31 00:42:24 abs Exp $
+
+1) By default dictd uses '${PATH_TO_M4} -P' for
+   preprocessing configuration file.
+
+   If you dislike this default
+   add dictd_flags='<your options>' to /etc/rc.conf.
+
+2) ${VARBASE}/log/dictd is a preferred directory for logging unless
+   syslog is used.
+
+3) See ${PREFIX}/share/doc/${PKGBASE}/NEWS file for upstream news.
+4) See ${PREFIX}/share/examples/${PKGBASE}/ directory
+   for samples of configuration file.
+
+===========================================================================
diff --git a/textproc/dict-server/Makefile.common b/textproc/dict-server/Makefile.common
new file mode 100644 (file)
index 0000000..abdfd50
--- /dev/null
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile.common,v 1.1 2009/12/31 00:42:24 abs Exp $
+# used by textproc/dict-server/Makefile
+# used by textproc/dict-client/Makefile
+DISTNAME=      dictd-1.11.2
+
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dict/} \
+               ftp://ftp.dict.org/pub/dict/
+
+MAINTAINER?=           cheusov@tut.by
+HOMEPAGE=              http://www.dict.org/
+
+PKG_DESTDIR_SUPPORT=   user-destdir
diff --git a/wip/deforaos-libdesktop/DESCR b/wip/deforaos-libdesktop/DESCR
new file mode 100644 (file)
index 0000000..edf5af1
--- /dev/null
@@ -0,0 +1 @@
+DeforaOS desktop library
diff --git a/wip/deforaos-libdesktop/Makefile b/wip/deforaos-libdesktop/Makefile
new file mode 100644 (file)
index 0000000..934cb6d
--- /dev/null
@@ -0,0 +1,20 @@
+# $NetBSD$
+#
+
+DISTNAME=      libDesktop-0.0.1
+PKGNAME=       deforaos-libdesktop-0.0.1
+CATEGORIES=    devel
+MASTER_SITES=  http://www.defora.org/os/download/download/3314/
+
+MAINTAINER=    khorben@defora.org
+HOMEPAGE=      http://www.defora.org/
+COMMENT=       DeforaOS desktop library
+
+LICENSE=       gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   DESTDIR=${DESTDIR}
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/deforaos-libdesktop/PLIST b/wip/deforaos-libdesktop/PLIST
new file mode 100644 (file)
index 0000000..020d366
--- /dev/null
@@ -0,0 +1,11 @@
+@comment $NetBSD$
+include/Desktop.h
+include/Desktop/about.h
+include/Desktop/accel.h
+include/Desktop/assistant.h
+include/Desktop/menubar.h
+include/Desktop/toolbar.h
+lib/libDesktop.a
+lib/libDesktop.so
+lib/libDesktop.so.0
+lib/libDesktop.so.0.0
diff --git a/wip/deforaos-libdesktop/buildlink3.mk b/wip/deforaos-libdesktop/buildlink3.mk
new file mode 100644 (file)
index 0000000..f56a03f
--- /dev/null
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=       deforaos-libdesktop
+
+.if !defined(DEFORAOS_LIBDESKTOP_BUILDLINK3_MK)
+DEFORAOS_LIBDESKTOP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.deforaos-libdesktop+=    deforaos-libdesktop>=0.0.1
+BUILDLINK_PKGSRCDIR.deforaos-libdesktop?=      ../../wip/deforaos-libdesktop
+
+.endif # DEFORAOS_LIBDESKTOP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -deforaos-libdesktop
diff --git a/wip/deforaos-libdesktop/distinfo b/wip/deforaos-libdesktop/distinfo
new file mode 100644 (file)
index 0000000..bbbcf1d
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (libDesktop-0.0.1.tar.gz) = 094b6cf33e0c4155110bdebee49964d2f3816a19
+RMD160 (libDesktop-0.0.1.tar.gz) = f42c6b71cc442619150b415a5e3a61df21b6e9d2
+Size (libDesktop-0.0.1.tar.gz) = 16400 bytes
diff --git a/wip/deforaos-mixer/DESCR b/wip/deforaos-mixer/DESCR
new file mode 100644 (file)
index 0000000..3e4c535
--- /dev/null
@@ -0,0 +1 @@
+DeforaOS desktop audio mixer
diff --git a/wip/deforaos-mixer/Makefile b/wip/deforaos-mixer/Makefile
new file mode 100644 (file)
index 0000000..e9f9abe
--- /dev/null
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+DISTNAME=      Mixer-0.0.1
+PKGNAME=       deforaos-mixer-0.0.1
+CATEGORIES=    audio
+MASTER_SITES=  http://www.defora.org/os/download/download/3317/
+
+MAINTAINER=    khorben@defora.org
+HOMEPAGE=      http://www.defora.org/
+COMMENT=       DeforaOS desktop audio mixer
+
+LICENSE=       gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   DESTDIR=${DESTDIR}
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../wip/deforaos-libdesktop/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/deforaos-mixer/PLIST b/wip/deforaos-mixer/PLIST
new file mode 100644 (file)
index 0000000..48d96a5
--- /dev/null
@@ -0,0 +1 @@
+@comment $NetBSD$
diff --git a/wip/deforaos-mixer/distinfo b/wip/deforaos-mixer/distinfo
new file mode 100644 (file)
index 0000000..c120980
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (Mixer-0.0.1.tar.gz) = 2449a8d6627519f5b0681a9c81c369edb0c54581
+RMD160 (Mixer-0.0.1.tar.gz) = 5bca39d905cfc90b09a68747f3180efda6ec710f
+Size (Mixer-0.0.1.tar.gz) = 6549 bytes
index 2fb1d2d..80f2c37 100644 (file)
@@ -1,13 +1,11 @@
 $NetBSD$
 
+SHA1 (patch-10_linux-gettext) = fe0cfbaae7fe9ba98ceffe3ef68e25a63b0d2afd
 SHA1 (patch-__enable_execute_stack) = 7fde8c41c0cbd2f718bc4cab219b8e5dc1e99c4f
-SHA1 (patch-aa) = a864ac2b3850603392bc9ea52746045dd263da15
 SHA1 (patch-ab) = b8af0f7ee12ac44a6246786b2239efd21fd2e63a
 SHA1 (patch-ac) = c7f76b4b87f0ac623daa0b344f67de1f800751d5
 SHA1 (patch-ad) = e8802d1de0f5df6b511eb52b474f7679eaf6496e
-SHA1 (patch-ae) = 06fe9943a34f4acfac277608ecd89fead44d2b71
-SHA1 (patch-af) = 43166083ee2fd62ff773036596fe0e7e73c995ac
-SHA1 (patch-ag) = c8965391a4a2af2274f1f8375ea87b4c79370720
-SHA1 (patch-ah) = fe0cfbaae7fe9ba98ceffe3ef68e25a63b0d2afd
+SHA1 (patch-configure-LDFLAGS_AC) = 794ec679e40bab7d2772ba11cad46910951e7ea0
 SHA1 (patch-grub-probe-netbsd) = 31424d470b0dba9723fb86ba7e9265ec81e2d34c
+SHA1 (patch-macroify-DEFAULT_DIRECTORY) = c085a748ab7b5ace6e0818be105cbf31d6f6440e
 SHA1 (patch-misc-realpath) = efa6c81c725138ce72c539e9650302aa2c0bc8c3
diff --git a/wip/grub2-current/patches/patch-aa b/wip/grub2-current/patches/patch-aa
deleted file mode 100644 (file)
index 21fe99d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- acinclude.m4.orig  2009-12-21 12:02:35.000000000 +0100
-+++ acinclude.m4
-@@ -93,7 +93,7 @@ else
- fi
- grub_cv_prog_objcopy_absolute=yes
- for link_addr in 0x2000 0x8000 0x7C00; do
--  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
-+  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC}$link_addr conftest.o -o conftest.exec]); then :
-   else
-     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
-   fi
diff --git a/wip/grub2-current/patches/patch-ae b/wip/grub2-current/patches/patch-ae
deleted file mode 100644 (file)
index b38b205..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- util/elf/grub-mkimage.c.orig       2009-12-30 14:00:31.000000000 +0100
-+++ util/elf/grub-mkimage.c
-@@ -390,7 +390,7 @@ main (int argc, char *argv[])
-           if (prefix)
-             free (prefix);
--          prefix = xstrdup ("(memdisk)/boot/grub");
-+          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
-           break;
-         case 'h':
diff --git a/wip/grub2-current/patches/patch-af b/wip/grub2-current/patches/patch-af
deleted file mode 100644 (file)
index 236ec8d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- util/i386/pc/grub-mkimage.c.orig   2009-12-30 14:00:31.000000000 +0100
-+++ util/i386/pc/grub-mkimage.c
-@@ -387,7 +387,7 @@ main (int argc, char *argv[])
-           if (prefix)
-             free (prefix);
--          prefix = xstrdup ("(memdisk)/boot/grub");
-+          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
-           break;
-         case 'c':
diff --git a/wip/grub2-current/patches/patch-ag b/wip/grub2-current/patches/patch-ag
deleted file mode 100644 (file)
index cdab1a5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- util/sparc64/ieee1275/grub-mkimage.c.orig  2009-12-30 14:00:31.000000000 +0100
-+++ util/sparc64/ieee1275/grub-mkimage.c
-@@ -254,7 +254,7 @@ main (int argc, char *argv[])
-           if (prefix)
-             free (prefix);
--          prefix = xstrdup ("(memdisk)/boot/grub");
-+          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
-           break;
-         case 'h':
diff --git a/wip/grub2-current/patches/patch-configure-LDFLAGS_AC b/wip/grub2-current/patches/patch-configure-LDFLAGS_AC
new file mode 100644 (file)
index 0000000..8b813e9
--- /dev/null
@@ -0,0 +1,31 @@
+--- acinclude.m4.orig  2009-12-30 22:05:08.000000000 +0100
++++ acinclude.m4       2009-12-30 21:56:05.000000000 +0100
+@@ -93,7 +93,7 @@
+ fi
+ grub_cv_prog_objcopy_absolute=yes
+ for link_addr in 0x2000 0x8000 0x7C00; do
+-  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
++  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC}$link_addr conftest.o -o conftest.exec]); then :
+   else
+     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
+   fi
+--- configure.ac.orig  2009-12-30 22:34:06.000000000 +0100
++++ configure.ac       2009-12-30 22:37:04.000000000 +0100
+@@ -311,7 +311,7 @@
+ if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+   TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
+-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
++  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
+ else
+   TARGET_IMG_LDSCRIPT=
+   TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
+@@ -446,7 +446,7 @@
+ if test "x$target_cpu" = xi386; then
+   if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+     # Check symbols provided by linker script.
+-    CFLAGS="$TARGET_CFLAGS -nostdlib $TARGET_IMG_LDFLAGS_AC -Wl,-Ttext,8000,--defsym,___main=0x8100"
++    CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
+   fi
+   if test "x$TARGET_APPLE_CC" != x1 ; then
+     grub_CHECK_BSS_START_SYMBOL
diff --git a/wip/grub2-current/patches/patch-macroify-DEFAULT_DIRECTORY b/wip/grub2-current/patches/patch-macroify-DEFAULT_DIRECTORY
new file mode 100644 (file)
index 0000000..7c9d732
--- /dev/null
@@ -0,0 +1,33 @@
+--- util/elf/grub-mkimage.c.orig       2009-12-30 14:00:31.000000000 +0100
++++ util/elf/grub-mkimage.c
+@@ -390,7 +390,7 @@ main (int argc, char *argv[])
+           if (prefix)
+             free (prefix);
+-          prefix = xstrdup ("(memdisk)/boot/grub");
++          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
+           break;
+         case 'h':
+--- util/i386/pc/grub-mkimage.c.orig   2009-12-30 14:00:31.000000000 +0100
++++ util/i386/pc/grub-mkimage.c
+@@ -387,7 +387,7 @@ main (int argc, char *argv[])
+           if (prefix)
+             free (prefix);
+-          prefix = xstrdup ("(memdisk)/boot/grub");
++          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
+           break;
+         case 'c':
+--- util/sparc64/ieee1275/grub-mkimage.c.orig  2009-12-30 14:00:31.000000000 +0100
++++ util/sparc64/ieee1275/grub-mkimage.c
+@@ -254,7 +254,7 @@ main (int argc, char *argv[])
+           if (prefix)
+             free (prefix);
+-          prefix = xstrdup ("(memdisk)/boot/grub");
++          prefix = xstrdup ("(memdisk)" DEFAULT_DIRECTORY);
+           break;
+         case 'h':
index 95d3f76..81c384b 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.677 2009/12/20 15:42:12 taca Exp $
+# $NetBSD: Makefile,v 1.678 2009/12/30 21:11:20 joerg Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -485,7 +485,6 @@ SUBDIR+=    seamonkey
 SUBDIR+=       seamonkey-bin
 SUBDIR+=       seamonkey-bin-flash
 SUBDIR+=       seamonkey-bin-java
-SUBDIR+=       seamonkey-bin-nightly
 SUBDIR+=       serf
 SUBDIR+=       sitecopy
 SUBDIR+=       skipstone
diff --git a/www/seamonkey-bin-nightly/DESCR b/www/seamonkey-bin-nightly/DESCR
deleted file mode 100644 (file)
index a62c37e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-The SeaMonkey project is a community effort to deliver production-quality
-releases of code derived from the application formerly known as "Mozilla
-Application Suite". Whereas the main focus of the Mozilla Foundation is on
-Mozilla Firefox and Mozilla Thunderbird, our group of dedicated volunteers
-works to ensure that you can have "everything but the kitchen sink" (a web
-browser, mail client, HTML composer, address book, IRC client and calendar),
-and have it stable enough for corporate use.
diff --git a/www/seamonkey-bin-nightly/Makefile b/www/seamonkey-bin-nightly/Makefile
deleted file mode 100644 (file)
index ed5ed1c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2008/03/07 05:18:21 jlam Exp $
-
-MOZILLA=       seamonkey
-
-COMMENT=       Full-featured gecko-based browser suite (nightly binary pkg)
-
-EMUL_PLATFORMS=                linux-i386
-EMUL_PLATFORMS+=       solaris-i386 solaris-sparc
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-.include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/www/seamonkey-bin-nightly/Makefile.common b/www/seamonkey-bin-nightly/Makefile.common
deleted file mode 100644 (file)
index 2bcbaf7..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2006/09/24 16:40:50 salo Exp $
-
-MASTER_SITES=  http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \
-               ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/
-
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-NO_CHECKSUM=   yes
-NO_SRC_ON_FTP= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+=    date
-
-.if !defined(MOZ_VER) || empty(MOZ_VER)
-MOZ_VER!=      ${DATE} +%Y%m%d
-.endif
-
-.include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/seamonkey-bin-nightly/Makefile.linux-i386 b/www/seamonkey-bin-nightly/Makefile.linux-i386
deleted file mode 100644 (file)
index 29f0f0a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.linux-i386,v 1.2 2009/01/04 18:48:47 shattered Exp $
-
-DISTNAME=      seamonkey-2.0a3pre.en-US.linux-i686
-EXTRACT_SUFX=  .tar.bz2
-
-MOZ_GTK2=      yes
-MOZ_PLATFORM=  linux
diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-i386 b/www/seamonkey-bin-nightly/Makefile.solaris-i386
deleted file mode 100644 (file)
index 7579156..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:35 jlam Exp $
-
-EMUL_REQD=     solaris>=10
-
-DISTNAME=      seamonkey-1.5a.en-US.solaris10-nosvg-i386
-EXTRACT_SUFX=  .tar.bz2
-
-MOZ_GTK2=      yes
-MOZ_PLATFORM=  solaris
diff --git a/www/seamonkey-bin-nightly/Makefile.solaris-sparc b/www/seamonkey-bin-nightly/Makefile.solaris-sparc
deleted file mode 100644 (file)
index 3fd1ee8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile.solaris-sparc,v 1.2 2007/08/23 18:20:35 jlam Exp $
-
-EMUL_REQD=     solaris>=10
-
-DISTNAME=      seamonkey-1.5a.en-US.solaris10-nosvg-sparc
-EXTRACT_SUFX=  .tar.bz2
-
-MOZ_GTK2=      yes
-MOZ_PLATFORM=  solaris