update Fri Sep 25 06:37:00 PDT 2009
authorCharlie <root@crater.dragonflybsd.org>
Fri, 25 Sep 2009 13:47:30 +0000 (06:47 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Fri, 25 Sep 2009 13:47:30 +0000 (06:47 -0700)
56 files changed:
devel/coccinelle/Makefile
devel/coccinelle/distinfo
devel/coccinelle/patches/patch-ac [new file with mode: 0644]
doc/CHANGES-2009
doc/TODO
lang/gcc44/Makefile
lang/python/pyversion.mk
multimedia/ffmpeg/Makefile
multimedia/ffmpeg/distinfo
multimedia/ffmpeg/patches/patch-ab [new file with mode: 0644]
news/inn/Makefile
news/inn/PLIST
news/inn/distinfo
news/inn/patches/patch-ak [new file with mode: 0644]
security/openct/Makefile
security/openct/distinfo
shells/bash-completion/MESSAGE [new file with mode: 0644]
shells/bash-completion/Makefile
shells/bash-completion/PLIST
shells/bash-completion/distinfo
shells/bash-completion/patches/patch-aa [new file with mode: 0644]
sysutils/nautilus/Makefile
sysutils/nautilus/distinfo
wip/Makefile
wip/TODO
wip/gcc44/DESCR [deleted file]
wip/gcc44/Makefile [deleted file]
wip/gcc44/PLIST [deleted file]
wip/gcc44/TODO [deleted file]
wip/gcc44/buildlink3.mk [deleted file]
wip/gcc44/distinfo [deleted file]
wip/gcc44/files/dragonfly-spec.h [deleted file]
wip/gcc44/files/dragonfly.h [deleted file]
wip/gcc44/files/i386-dragonfly.h [deleted file]
wip/gcc44/files/i386-dragonfly64.h [deleted file]
wip/gcc44/patches/patch-aa [deleted file]
wip/gcc44/patches/patch-ab [deleted file]
wip/gcc44/patches/patch-cc [deleted file]
wip/gcc44/patches/patch-da [deleted file]
wip/gcc44/patches/patch-db [deleted file]
wip/mpg123-oss/PLIST
wip/mpg123-sun/PLIST
wip/mpg123/Makefile.common
wip/mpg123/PLIST
wip/smtp-gated/Makefile
wip/smtp-gated/PLIST
wip/smtp-gated/distinfo
wip/super-smack/Makefile
wip/super-smack/PLIST
wip/tellico/DESCR [new file with mode: 0644]
wip/tellico/Makefile [new file with mode: 0644]
wip/tellico/PLIST [new file with mode: 0644]
wip/tellico/distinfo [new file with mode: 0644]
wip/vdesk/Makefile
wip/vdesk/PLIST
wip/wbox/Makefile

index 77f37ca..b71fc45 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/25 09:13:58 wiz Exp $
 
 DISTNAME=      coccinelle-0.1.8
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.emn.fr/x-info/coccinelle/distrib/
 #http://aryx.cs.uiuc.edu/~pad/software/project-coccinelle/
index 347de58..0cafcef 100644 (file)
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/05/10 21:26:12 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/09/25 09:13:58 wiz Exp $
 
 SHA1 (coccinelle-0.1.8.tgz) = 8531f601873950ea79f60671ea8de76365d86277
 RMD160 (coccinelle-0.1.8.tgz) = b55954f191bfd286df7005836ba5bb025d077cf3
 Size (coccinelle-0.1.8.tgz) = 1914684 bytes
 SHA1 (patch-aa) = 12614a91c49a3bbf4d707b4a65fee5e3aba58b3f
 SHA1 (patch-ab) = 0be4fb19afdb530c5d27f0611cc9d245b6db0bad
+SHA1 (patch-ac) = c74bfbb076b80143a8ecc5e65b6e48bbd12acce5
diff --git a/devel/coccinelle/patches/patch-ac b/devel/coccinelle/patches/patch-ac
new file mode 100644 (file)
index 0000000..a013321
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2009/09/25 09:13:58 wiz Exp $
+
+--- parsing_c/compare_c.ml.orig        2009-09-23 18:41:30.000000000 -0500
++++ parsing_c/compare_c.ml     2009-09-23 18:40:48.000000000 -0500
+@@ -31,6 +31,8 @@ type compare_result = 
+  * is not enough to substituate until the end of the line. *)
+ let cvs_keyword_list = [
+   "Id";"Date"; "Revision"; (* the common one *)
++  "FreeBSD";"Heimdal";"KAME";"NetBSD";"OpenBSD";"OpenLDAP";"RuOBSD";
++  "SourceForge";
+   "Name";"Author";"CVSHeader";"Header";"Locker";"RCSfile";"Source";"State";
+   "Rev";
+ ]
index b4daf30..5927d7e 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.3828 2009/09/25 07:31:36 schmonz Exp $
+$NetBSD: CHANGES-2009,v 1.3834 2009/09/25 12:48:16 tron Exp $
 
 Changes to the packages collection and infrastructure in 2009 [FROZEN for pkgsrc-2009Q3]:
 
@@ -4971,3 +4971,8 @@ Changes to the packages collection and infrastructure in 2009 [FROZEN for pkgsrc
        Updated print/teTeX3-bin to 3.0nb37 [minskim 2009-09-24]
        Updated multimedia/vlc to 1.0.2 [ahoka 2009-09-24]
        Updated www/ikiwiki to 3.14159265 [schmonz 2009-09-25]
+       Updated security/openct to 0.6.18 [hasso 2009-09-25]
+       Updated sysutils/nautilus to 2.26.4 [wiz 2009-09-25]
+       Updated devel/coccinelle to 0.1.8nb1 [wiz 2009-09-25]
+       Updated multimedia/ffmpeg to 20090611nb4 [tron 2009-09-25]
+       Updated shells/bash-completion to 1.0 [wiz 2009-09-25]
index 3403457..79d0695 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.8497 2009/09/25 07:31:36 schmonz Exp $
+$NetBSD: TODO,v 1.8498 2009/09/25 09:11:27 wiz Exp $
 
 Suggested new packages
 ======================
@@ -943,7 +943,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o mysqlcc-0.9.8
        o nagios-3.2.0
        o nap-1.5.3
-       o nautilus-2.26.4 [GNOME 2.28]
        o nautilus-sendto-1.1.7
        o navi2ch-1.8.1
        o nawk-20071023
index 59944eb..7e01d65 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/09/25 02:48:08 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/25 09:37:57 wiz Exp $
 #
 
 DISTNAME=              gcc-${GCC_VERSION}
@@ -13,7 +13,7 @@ HOMEPAGE=             http://gcc.gnu.org/
 COMMENT=               GNU Compiler Collection 4.4
 LICENSE=               gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
-PKG_DESTDIR_SUPPORT=   destdir
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=            awk:run bash:run perl chmod \
                        gmake:run makeinfo msgfmt bison flex gm4 \
index e477554..36a819c 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.75 2009/09/22 13:46:09 tron Exp $
+# $NetBSD: pyversion.mk,v 1.76 2009/09/25 13:36:19 tron Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -68,7 +68,7 @@ PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
 BUILD_DEFS+=           PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=   PYPACKAGE
 
-.if ${OPSYS} != "Darwin" || ${ABI} != "64"
+.if empty(MACHINE_PLATFORM:MDarwin-*.*-x86_64)
 PYTHON_VERSION_DEFAULT?=               25
 .else
 PYTHON_VERSION_DEFAULT?=               26
index 7092dc2..f84f341 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2009/09/20 08:13:21 ahoka Exp $
+# $NetBSD: Makefile,v 1.54 2009/09/25 11:10:21 tron Exp $
 
-PKGREVISION=   3
+PKGREVISION=   4
 
 MAINTAINER=    ahoka@NetBSD.org
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
index a90141a..4ca830d 100644 (file)
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.30 2009/09/22 16:46:50 ahoka Exp $
+$NetBSD: distinfo,v 1.31 2009/09/25 11:10:21 tron Exp $
 
 SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
 Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
 SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1
+SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7
 SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b
 SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0
 SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a
diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab
new file mode 100644 (file)
index 0000000..734037b
--- /dev/null
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.6 2009/09/25 11:10:21 tron Exp $
+
+Patch for the vulnerability reported in SA36760, taken from here:
+
+http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=ebbccbaa5e925c2ddb212559f82c29ef526cc17e
+http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=7798d31bee361724e0a6ede4e2fd67228f24040b
+
+--- libavformat/sierravmd.c.orig       2009-02-16 14:45:05.000000000 +0000
++++ libavformat/sierravmd.c    2009-09-25 11:49:56.000000000 +0100
+@@ -154,7 +154,7 @@
+     vmd->frame_table = NULL;
+     sound_buffers = AV_RL16(&vmd->vmd_header[808]);
+     raw_frame_table_size = vmd->frame_count * 6;
+-    if(vmd->frame_count * vmd->frames_per_block  >= UINT_MAX / sizeof(vmd_frame)){
++    if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame) - sound_buffers){
+         av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n");
+         return -1;
+     }
index 0a5f319..f7fa0a1 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2009/09/22 13:17:00 spz Exp $
+# $NetBSD: Makefile,v 1.98 2009/09/25 11:06:00 spz Exp $
 
 DISTNAME=              inn-2.5.0
 CATEGORIES=            news
+PKGREVISION=           1
 MASTER_SITES=          ftp://ftp.isc.org/isc/inn/ \
                        ftp://ftp.fu-berlin.de/unix/news/inn/
 
@@ -33,8 +34,8 @@ CONFIGURE_ARGS+=      --enable-setgid-inews                           \
                        --enable-largefiles                             \
                        --bindir=${PREFIX}/${INN_PATHBIN}               \
                        --sbindir=${PREFIX}/${INN_PATHBIN}              \
+                       --sysconfdir=${PREFIX}/etc/inn                  \
                        --with-openssl=${SSLBASE:Q}                     \
-                       --with-etc-dir=${PREFIX}/etc/inn                \
                        --with-doc-dir=${PREFIX}/share/doc/inn          \
                        --with-control-dir=${PREFIX}/${INN_PATHBIN}/control \
                        --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \
index 51cd17b..726f206 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/09/22 13:17:00 spz Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/09/25 11:06:00 spz Exp $
 bin/inews
 bin/rnews
 include/inn/buffer.h
@@ -9,16 +9,21 @@ include/inn/hashtab.h
 include/inn/history.h
 include/inn/innconf.h
 include/inn/inndcomm.h
+include/inn/libinn.h
 include/inn/list.h
 include/inn/md5.h
 include/inn/messages.h
 include/inn/mmap.h
 include/inn/network.h
 include/inn/newsuser.h
+include/inn/nntp.h
 include/inn/options.h
+include/inn/ov.h
 include/inn/overview.h
+include/inn/paths.h
 include/inn/qio.h
 include/inn/sequence.h
+include/inn/storage.h
 include/inn/system.h
 include/inn/timer.h
 include/inn/tst.h
@@ -26,11 +31,6 @@ include/inn/utility.h
 include/inn/vector.h
 include/inn/version.h
 include/inn/wire.h
-include/inn/libinn.h
-include/inn/nntp.h
-include/inn/ov.h
-include/inn/paths.h
-include/inn/storage.h
 lib/innreport_inn.pm
 lib/innshellvars
 lib/innshellvars.pl
@@ -38,6 +38,7 @@ lib/innshellvars.tcl
 lib/libinn.a
 lib/libinnhist.a
 lib/libstorage.a
+lib/perl/INN/Config.pm
 ${INN_PATHBIN}/actmerge
 ${INN_PATHBIN}/actsync
 ${INN_PATHBIN}/actsyncd
@@ -48,6 +49,7 @@ ${INN_PATHBIN}/auth/resolv/domain
 ${INN_PATHBIN}/auth/resolv/ident
 ${INN_PATHBIN}/batcher
 ${INN_PATHBIN}/buffchan
+${INN_PATHBIN}/buffindexed_d
 ${INN_PATHBIN}/cnfsheadconf
 ${INN_PATHBIN}/cnfsstat
 ${INN_PATHBIN}/control/checkgroups.pl
@@ -84,6 +86,7 @@ ${INN_PATHBIN}/getlist
 ${INN_PATHBIN}/grephistory
 ${INN_PATHBIN}/imapfeed
 ${INN_PATHBIN}/inews
+${INN_PATHBIN}/innbind
 ${INN_PATHBIN}/inncheck
 ${INN_PATHBIN}/innconfval
 ${INN_PATHBIN}/innd
@@ -118,6 +121,7 @@ ${INN_PATHBIN}/prunehistory
 ${INN_PATHBIN}/pullnews
 ${INN_PATHBIN}/rc.news
 ${INN_PATHBIN}/rnews
+${INN_PATHBIN}/rnews.libexec/bunbatch
 ${INN_PATHBIN}/rnews.libexec/c7unbatch
 ${INN_PATHBIN}/rnews.libexec/decode
 ${INN_PATHBIN}/rnews.libexec/encode
@@ -136,6 +140,7 @@ ${INN_PATHBIN}/simpleftp
 ${INN_PATHBIN}/sm
 ${INN_PATHBIN}/tally.control
 ${INN_PATHBIN}/tdx-util
+${INN_PATHBIN}/tinyleaf
 ${INN_PATHBIN}/writelog
 man/man1/convdate.1
 man/man1/fastrm.1
@@ -211,8 +216,8 @@ man/man8/expireover.8
 man/man8/expirerm.8
 man/man8/filechan.8
 man/man8/ident.8
-man/man8/inncheck.8
 man/man8/innbind.8
+man/man8/inncheck.8
 man/man8/innd.8
 man/man8/inndf.8
 man/man8/innreport.8
@@ -249,6 +254,7 @@ man/man8/tinyleaf.8
 man/man8/writelog.8
 sbin/cnfsstat
 sbin/ctlinnd
+sbin/innbind
 sbin/makehistory
 share/doc/inn/CONTRIBUTORS
 share/doc/inn/GPL
@@ -291,8 +297,8 @@ share/examples/inn/motd.news
 share/examples/inn/news2mail.cf
 share/examples/inn/newsfeeds
 share/examples/inn/newsgroups.minimal
-share/examples/inn/nntpsend.ctl
 share/examples/inn/nnrpd.track
+share/examples/inn/nntpsend.ctl
 share/examples/inn/nocem.ctl
 share/examples/inn/ovdb.conf
 share/examples/inn/passwd.nntp
index 3c5a489..dd5b2e5 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2009/09/22 13:17:00 spz Exp $
+$NetBSD: distinfo,v 1.22 2009/09/25 11:06:00 spz Exp $
 
 SHA1 (inn-2.5.0.tar.gz) = f009da670e2594d9079e7fb26f32d10c640d24e6
 RMD160 (inn-2.5.0.tar.gz) = 0b9583eef8fe86131297d403323ab6ff2906fe06
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d
 SHA1 (patch-ag) = 8041d7d78c26fd7b505d9955dbdb91f2b8cb8ab2
 SHA1 (patch-ah) = bf0a72348958a89dc28d08dd324e5ee9acfae2c8
 SHA1 (patch-ai) = 28ab36f22920a3bcd2c99578a5b75db3012cf106
+SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065
diff --git a/news/inn/patches/patch-ak b/news/inn/patches/patch-ak
new file mode 100644 (file)
index 0000000..5876263
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2009/09/25 11:06:00 spz Exp $
+
+--- perl/INN/Config.pm.in.orig 2009-05-21 22:08:33.000000000 +0200
++++ perl/INN/Config.pm.in
+@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
+ ##  Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `@bindir@/innconfval -p`;
+ foreach $line (@values) {
+   eval 'our '.$line;
+   if ($line =~ /^(.*?) = /m) {
index c2a80a6..db21fa4 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/08/03 18:44:23 hasso Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/25 08:36:05 hasso Exp $
 
-DISTNAME=              openct-0.6.17
+DISTNAME=              openct-0.6.18
 CATEGORIES=            security
 MASTER_SITES=          http://www.opensc-project.org/files/openct/
 
index 5357e13..ec58b18 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/08/03 18:44:23 hasso Exp $
+$NetBSD: distinfo,v 1.4 2009/09/25 08:36:05 hasso Exp $
 
-SHA1 (openct-0.6.17.tar.gz) = 76572e7a2980c85a83faf1c4df5d418839c73472
-RMD160 (openct-0.6.17.tar.gz) = 45a300fd417af579d20a47d48df48de8db287f31
-Size (openct-0.6.17.tar.gz) = 688501 bytes
+SHA1 (openct-0.6.18.tar.gz) = b0c5bfa92683fd6c608e21eb07559dfd666f1883
+RMD160 (openct-0.6.18.tar.gz) = 377fe50775a5bd104aadf7770f14f494047a099a
+Size (openct-0.6.18.tar.gz) = 688931 bytes
 SHA1 (patch-aa) = d44e8daa9cc402c8276bf385a5fbbe5a498b37bb
diff --git a/shells/bash-completion/MESSAGE b/shells/bash-completion/MESSAGE
new file mode 100644 (file)
index 0000000..75f9871
--- /dev/null
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2009/09/25 12:29:26 wiz Exp $
+
+To use this, source the included bash fragment in your startup
+files, i.e. include something like:
+
+  if [ -r ${PREFIX}/share/bash-completion/bash_completion ]; then
+    . ${PREFIX}/share/bash-completion/bash_completion
+  fi
+
+in ~/.bashrc or ~/.bash_profile.
+
+===========================================================================
index 7328e38..86d6435 100644 (file)
@@ -1,29 +1,45 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/25 12:29:26 wiz Exp $
 #
+# Note to packagers:
+# packages installing additional completion files should drop
+# them into ${DESTDIR}${PREFIX}/share/bash-completion.d
+# with the name of the package as file name.
 
-DISTNAME=      bash-completion-20060301
+DISTNAME=      bash-completion-1.0
 CATEGORIES=    shells
-MASTER_SITES=  http://www.caliban.org/files/bash/
+MASTER_SITES=  http://bash-completion.alioth.debian.org/files/
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      http://www.caliban.org/bash/index.shtml
+HOMEPAGE=      http://bash-completion.alioth.debian.org/
 COMMENT=       Programmable completion specifications for bash
+LICENSE=       gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=    bash:run
 
-WRKSRC=                ${WRKDIR}/bash_completion
 USE_LANGUAGES= # none
 
-NO_BUILD=      yes
+INSTALLATION_DIRS=     bin share/bash-completion
+INSTALLATION_DIRS+=    share/bash-completion.d
+INSTALLATION_DIRS+=    share/doc/bash-completion
 
-INSTALLATION_DIRS=     share/bash-completion/contrib share/doc/bash-completion
+SUBST_CLASSES+=                path
+SUBST_SED.path+=       -e "s,/etc/bash_completion,${PREFIX}/share/bash-completion/bash_completion,g"
+SUBST_STAGE.path+=     pre-build
+SUBST_FILES.path+=     bash_completion* README
+SUBST_MESSAGE.path=    Fixing path to completion files.
+
+do-build:
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/bash-completion
-       ${INSTALL_DATA} ${WRKSRC}/bash* ${DESTDIR}${PREFIX}/share/bash-completion
+       ${INSTALL_DATA} ${WRKSRC}/README \
+               ${DESTDIR}${PREFIX}/share/doc/bash-completion
+       ${INSTALL_DATA} ${WRKSRC}/bash_completion \
+               ${DESTDIR}${PREFIX}/share/bash-completion
+       ${INSTALL_DATA} ${WRKSRC}/bash_completion.sh \
+               ${DESTDIR}${PREFIX}/share/bash-completion
        ${INSTALL_DATA} ${WRKSRC}/contrib/* \
-           ${DESTDIR}${PREFIX}/share/bash-completion/contrib
+           ${DESTDIR}${PREFIX}/share/bash-completion.d
 
 .include "../../mk/bsd.pkg.mk"
index f3c3330..9bdb6ed 100644 (file)
@@ -1,32 +1,48 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:14:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/25 12:29:26 wiz Exp $
 share/bash-completion/bash_completion
 share/bash-completion/bash_completion.sh
-share/bash-completion/contrib/bitkeeper
-share/bash-completion/contrib/bittorrent
-share/bash-completion/contrib/cksfv
-share/bash-completion/contrib/clisp
-share/bash-completion/contrib/dsniff
-share/bash-completion/contrib/freeciv
-share/bash-completion/contrib/gcl
-share/bash-completion/contrib/gkrellm
-share/bash-completion/contrib/gnatmake
-share/bash-completion/contrib/harbour
-share/bash-completion/contrib/hg
-share/bash-completion/contrib/isql
-share/bash-completion/contrib/larch
-share/bash-completion/contrib/lilypond
-share/bash-completion/contrib/lisp
-share/bash-completion/contrib/mailman
-share/bash-completion/contrib/mcrypt
-share/bash-completion/contrib/modules
-share/bash-completion/contrib/mtx
-share/bash-completion/contrib/p4
-share/bash-completion/contrib/povray
-share/bash-completion/contrib/ri
-share/bash-completion/contrib/sbcl
-share/bash-completion/contrib/sitecopy
-share/bash-completion/contrib/snownews
-share/bash-completion/contrib/svk
-share/bash-completion/contrib/unace
-share/bash-completion/contrib/unrar
+share/bash-completion.d/_subversion
+share/bash-completion.d/apache2ctl
+share/bash-completion.d/bitkeeper
+share/bash-completion.d/bittorrent
+share/bash-completion.d/brctl
+share/bash-completion.d/cksfv
+share/bash-completion.d/clisp
+share/bash-completion.d/cowsay
+share/bash-completion.d/cpan2dist
+share/bash-completion.d/dsniff
+share/bash-completion.d/freeciv
+share/bash-completion.d/gcl
+share/bash-completion.d/gkrellm
+share/bash-completion.d/gnatmake
+share/bash-completion.d/gpg2
+share/bash-completion.d/harbour
+share/bash-completion.d/isql
+share/bash-completion.d/larch
+share/bash-completion.d/lilypond
+share/bash-completion.d/lisp
+share/bash-completion.d/lzma
+share/bash-completion.d/lzop
+share/bash-completion.d/mailman
+share/bash-completion.d/mcrypt
+share/bash-completion.d/minicom
+share/bash-completion.d/modules
+share/bash-completion.d/monodevelop
+share/bash-completion.d/mtx
+share/bash-completion.d/net-tools
+share/bash-completion.d/p4
+share/bash-completion.d/povray
+share/bash-completion.d/qdbus
+share/bash-completion.d/qemu
+share/bash-completion.d/quota-tools
+share/bash-completion.d/rdesktop
+share/bash-completion.d/ri
+share/bash-completion.d/sbcl
+share/bash-completion.d/sitecopy
+share/bash-completion.d/snownews
+share/bash-completion.d/ssh
+share/bash-completion.d/svk
+share/bash-completion.d/unace
+share/bash-completion.d/unrar
+share/bash-completion.d/vncviewer
 share/doc/bash-completion/README
index fca8f66..e92971c 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/12 09:47:58 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/09/25 12:29:26 wiz Exp $
 
-SHA1 (bash-completion-20060301.tar.gz) = c99206545484c5d970803b098ce3cb84644cabc3
-RMD160 (bash-completion-20060301.tar.gz) = 12c9c11600e08f9b3547586d5a82441b1dfc290a
-Size (bash-completion-20060301.tar.gz) = 123300 bytes
+SHA1 (bash-completion-1.0.tar.gz) = 61040795731f5ff509c46e818a1edf0a7a93e11d
+RMD160 (bash-completion-1.0.tar.gz) = b590c2633c5c10c3e98b14a74f4e96c910b6177d
+Size (bash-completion-1.0.tar.gz) = 143578 bytes
+SHA1 (patch-aa) = 6c6685a3fa99c2e0585843a1138a225b2c2ea537
diff --git a/shells/bash-completion/patches/patch-aa b/shells/bash-completion/patches/patch-aa
new file mode 100644 (file)
index 0000000..42c6fc2
--- /dev/null
@@ -0,0 +1,63 @@
+$NetBSD: patch-aa,v 1.1 2009/09/25 12:29:27 wiz Exp $
+
+--- bash_completion.orig       2009-04-02 20:01:39.000000000 +0000
++++ bash_completion
+@@ -724,6 +724,11 @@ complete -F _complete complete
+       extract patch configure build install reinstall \
+       deinstall clean clean-depends kernel buildworld' make
++# a little help for NetBSD pkgsrc users
++[ $UNAME = NetBSD ] && complete -W 'index search fetch fetch-list \
++      extract patch configure build install reinstall \
++      deinstall package clean clean-depends' make
++
+ # This completes on a list of all available service scripts for the
+ # 'service' command and/or the SysV init.d directory, followed by
+ # that script's available commands
+@@ -941,7 +946,7 @@ complete -F _insmod $filenames insmod mo
+ #
+ [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
+   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
+-  -o $UNAME = OpenBSD ] &&
++  -o $UNAME = OpenBSD -o $UNAME = NetBSD ] &&
+ _man()
+ {
+       local cur prev sect manpath manext mansect UNAME
+@@ -1013,7 +1018,7 @@ _man()
+ }
+ [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
+   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
+-  -o $UNAME = OpenBSD ] && \
++  -o $UNAME = OpenBSD -o $UNAME = NetBSD ] && \
+ complete -F _man $filenames man apropos whatis
+ # renice(8) completion
+@@ -5627,6 +5632,28 @@ _links()
+ } &&
+ complete -F _links $filenames links
++[ $UNAME = NetBSD ] && {
++# NetBSD package management tool completion
++#
++_pkg_delete()
++{
++      local cur pkgdir prev
++
++      pkgdir=${PKG_DBDIR:-/var/db/pkg}/
++      cur=`_get_cword`
++      prev=${COMP_WORDS[COMP_CWORD-1]}
++
++      [ "$prev" = "-o" -o "$prev" = "-p" -o "$prev" = "-W" ] && return 0
++
++      COMPREPLY=( $( compgen -d $pkgdir$cur ) )
++      COMPREPLY=( ${COMPREPLY[@]#$pkgdir} )
++
++      return 0
++}
++complete -F _pkg_delete $dirnames pkg_delete pkg_info
++have pkg_deinstall && complete -F _pkg_delete $dirnames pkg_deinstall
++}
++
+ [ $UNAME = FreeBSD ] && {
+ # FreeBSD package management tool completion
+ #
index a3cfefc..6916a6a 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2009/08/26 19:56:54 sno Exp $
+# $NetBSD: Makefile,v 1.103 2009/09/25 09:11:14 wiz Exp $
 #
 
-DISTNAME=              nautilus-2.26.3
-PKGREVISION=           2
+DISTNAME=              nautilus-2.26.4
 CATEGORIES=            sysutils gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/nautilus/2.26/}
 EXTRACT_SUFX=          .tar.bz2
index d1d2cbc..4932708 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2009/05/19 23:52:15 wiz Exp $
+$NetBSD: distinfo,v 1.46 2009/09/25 09:11:14 wiz Exp $
 
-SHA1 (nautilus-2.26.3.tar.bz2) = e9ec2daac93eac185cef42a688c3ebefcca1f7fe
-RMD160 (nautilus-2.26.3.tar.bz2) = ba8b6dcd14c9d8615900d5ec236555223b3c315e
-Size (nautilus-2.26.3.tar.bz2) = 5913186 bytes
+SHA1 (nautilus-2.26.4.tar.bz2) = 7eab587e0b88e3eab8196f64596207a1dc1c4b33
+RMD160 (nautilus-2.26.4.tar.bz2) = 4af723021ece1fb9a37bd3bcc2de903b6c7dca61
+Size (nautilus-2.26.4.tar.bz2) = 5815912 bytes
 SHA1 (patch-aj) = 52df33053c30c12a5d6aac26bbd3e8c317800d1a
index 8dfa982..8c21881 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3627 2009/09/24 06:12:07 phonohawk Exp $
+# $Id: Makefile,v 1.3629 2009/09/25 10:28:17 thomasklausner Exp $
 #
 
 COMMENT=       WIP pkgsrc packages
@@ -456,7 +456,6 @@ SUBDIR+=    gauche-dbd-pg
 SUBDIR+=       gauche-fastcgi
 SUBDIR+=       gcc42
 SUBDIR+=       gcc43
-SUBDIR+=       gcc44
 SUBDIR+=       gconf-cleaner
 SUBDIR+=       gdal
 SUBDIR+=       gdal-docs
@@ -2070,6 +2069,7 @@ SUBDIR+=  tde
 SUBDIR+=       teamspeak
 SUBDIR+=       teapot
 SUBDIR+=       teco
+SUBDIR+=       tellico
 SUBDIR+=       tendra
 SUBDIR+=       tendra.org-sid
 SUBDIR+=       tenmado
index 4f383e3..d3db76e 100644 (file)
--- a/wip/TODO
+++ b/wip/TODO
@@ -13,12 +13,12 @@ Suggested package updates
        o cdogs-0.4
        o chora-2.0.1
        o chromium-0.9.14
-       o cinelerra-2.1
+       o cinelerra-4.1
        o d4x-2.5.7.1
        o daphne-1.0
        o directfb-1.0.0
        o ecasound-2.6.0
-       o editline-20090905.3.0
+       o editline-20090923.3.0
        o emelfm2-0.6.2
        o endeavour-3.1.3
        o fakenes-0.5.7
@@ -28,7 +28,6 @@ Suggested package updates
        o gambas2-2.16
        o gcc42-4.2.4
        o gcc43-4.3.4
-       o gcc44-4.4.1
        o geant-4.9.2
        o gforge-4.5.11
        o globulation2-0.9.4
@@ -61,7 +60,6 @@ Suggested package updates
        o moe-1.3
        o mpich2-1.1
        o mpgedit-0.73dev2
-       o muine-0.8.11
        o mupen64-0.5
        o musca-0.9.23
        o nautilus-open-terminal-0.17
@@ -73,7 +71,7 @@ Suggested package updates
        o parted-1.9.0
        o passepartout-0.7.1
        o pdnsd-1.2.7
-       o pike-7.8.316
+       o pike-7.8.352
        o py-PyPE-2.8.8
        o py-gnucash-0.7.55
        o qcomicbook-0.4.4
@@ -98,6 +96,7 @@ Suggested package updates
        o vinagre-2.26.0
        o virtualbox-3.0.6
        o xaralx-bin-0.7.1692
+       o xcursor-themes-1.0.2
        o xf86-video-geode-2.11.5
        o xinetd-2.3.14
        o xmms2-0.6
diff --git a/wip/gcc44/DESCR b/wip/gcc44/DESCR
deleted file mode 100644 (file)
index 9f24f41..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the gcc 4.4.0 compiler suite.
-
-This package has a test target. For testing (only), this
-package requires dejagnu.
diff --git a/wip/gcc44/Makefile b/wip/gcc44/Makefile
deleted file mode 100644 (file)
index b5397f9..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=              gcc-${GCC_VERSION}
-PKGNAME=               gcc44-${GCC_VERSION}
-CATEGORIES=            lang
-MASTER_SITES=          ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
-EXTRACT_SUFX=          .tar.bz2
-
-MAINTAINER=            blair.sadewitz@gmail.com
-HOMEPAGE=              http://gcc.gnu.org/
-COMMENT=               This is the GCC 4.4.0 compiler
-
-USE_TOOLS+=            awk:run bash:build perl chmod ar \
-                       gmake makeinfo msgfmt bison flex gm4
-
-GCC_VERSION=           4.4.0
-
-GCC_SUBPREFIX=         gcc44
-GCC_PREFIX=            ${DESTDIR}${PREFIX}/${GCC_SUBPREFIX}
-FILES_SUBST+=          PKGNAME=${PKGNAME:Q}
-MESSAGE_SUBST+=                GCC_PREFIX=${GCC_PREFIX}
-
-# XXX do you really need this? you do it manually
-HAS_CONFIGURE=         YES # no GNU_CONFIGURE!
-# To avoid GNU surprises
-CONFIG_SHELL=          ${TOOLS_PATH.bash}
-PLIST_SRC=             ${WRKDIR}/PLIST_DYNAMIC
-# XXX do you really need c++ to compile gcc?
-USE_LANGUAGES+=                c c++
-
-NOT_FOR_PLATFORM=      Interix-*-*
-UNLIMIT_RESOURCES+=    datasize
-
-.undef PKG_DEVELOPER
-
-.include "../../mk/bsd.prefs.mk"
-
-# Determine whether to use binutils
-
-# REPLACE_AWK+=        gcc/testsuite/gcc.test-framework/test-framework.awk     \
-#              gcc/mkmap-symver.awk                                    \
-#              gcc/optc-gen.awk                                        \
-#              gcc/mkmap-flat.awk                                      \
-#              gcc/opt-gather.awk                                      \
-#              gcc/opth-gen.awk                                        \
-#              gcc/opt-functions.awk
-
-# Optional languages - change as required
-#
-# XXX As of now, only BUILD_CXX BUILD_OBJC and BUILD_FORTRAN are supported
-BUILD_DEFS+=           BUILD_CXX BUILD_OBJC BUILD_FORTRAN
-BUILD_CXX?=            YES
-BUILD_FORTRAN?=                YES
-BUILD_OBJC?=           YES
-
-LANGS= c
-.if !empty(BUILD_CXX:M[Yy][Ee][Ss])
-LANGS+= c++
-.endif
-.if !empty(BUILD_FORTRAN:M[Yy][Ee][Ss])
-LANGS+= fortran
-.endif
-.if !empty(BUILD_OBJC:M[Yy][Ee][Ss])
-LANGS+= objc
-.endif
-
-CONFIGURE_ARGS+=       --prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=       --enable-languages=${LANGS:Q}
-CONFIGURE_ARGS+=       --with-system-zlib
-CONFIGURE_ARGS+=       --enable-shared
-CONFIGURE_ARGS+=       --enable-__cxa_atexit
-CONFIGURE_ARGS+=       --enable-long-long
-CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+=       --disable-libssp
-CONFIGURE_ARGS+=       --enable-threads=posix # XXX seems to be needed
-CONFIGURE_ARGS+=       --with-gmp=${BUILDLINK_PREFIX.gmp}
-CONFIGURE_ARGS+=       --with-mpfr=${BUILDLINK_PREFIX.mpfr}
-
-CONFIGURE_ENV+=                CONFIG_SHELL=${CONFIG_SHELL:Q}
-
-MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
-MAKE_ENV+=             SHELL=${CONFIG_SHELL}
-MAKE_ENV+=             ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
-
-CPPFLAGS+=             -I${BUILDLINK_DIR}/include
-CFLAGS+=               -I${BUILDLINK_DIR}/include
-
-# Somone should fix this so it will match the NetBSD system compiler
-#.if ${OPSYS} == "NetBSD"
-#GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
-#CONFIGURE_ARGS+=      --host=${GCC_PLATFORM:Q}
-#MAKE_ENV+=            AR=/usr/bin/ar
-#.endif # NetBSD
-
-pre-configure:
-.if ${OPSYS} == "DragonFly"
-       ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/gcc/config/dragonfly.h
-       ${CP} ${FILESDIR}/dragonfly-spec.h ${WRKSRC}/gcc/config/dragonfly-spec.h
-       ${CP} ${FILESDIR}/i386-dragonfly.h ${WRKSRC}/gcc/config/i386/dragonfly.h
-       ${CP} ${FILESDIR}/i386-dragonfly64.h ${WRKSRC}/gcc/config/i386/dragonfly64.h
-.endif
-
-
-do-configure:
-       ${MKDIR} ${WRKDIR}/obj
-       cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
-
-do-build:
-       (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} )
-
-# do-build:
-#      (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} bootstrap)
-
-do-test:
-.if (${MACHINE_GNU_ARCH} == "x86_64")
-       (cd ${FILESDIR} && ${CP} netbsd64macro.dfs ${WRKSRC}/gcc/testsuite/ada/acats/support/macro.dfs)
-.endif
-       (cd ${WRKDIR}/obj && ${GMAKE} -k check)
-
-do-install:
-       (cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} install \
-        && ${TEST} -f ${GCC_PREFIX}/bin/cc || ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc)
-
-post-install:
-       ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-       ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print   \
-               | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
-               >> ${PLIST_SRC}
-       ${FIND} ${GCC_PREFIX} -type d -print    \
-               | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"       \
-               >> ${PLIST_SRC}
-
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
-#.include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wip/gcc44/PLIST b/wip/gcc44/PLIST
deleted file mode 100644 (file)
index b0b78c6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/29 18:01:24 shannonjr Exp $
diff --git a/wip/gcc44/TODO b/wip/gcc44/TODO
deleted file mode 100644 (file)
index cfe321c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Compiles path to buildlink-sed into
-/usr/pkg/gcc44/libexec/gcc/x86_64-unknown-netbsd5.99.16/4.4.0/install-tools/fixincl
diff --git a/wip/gcc44/buildlink3.mk b/wip/gcc44/buildlink3.mk
deleted file mode 100644 (file)
index 7b1b501..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/01/17 03:11:19 rillig Exp $
-
-BUILDLINK_PREFIX.gcc44:=${LOCALBASE}/gcc44
-
-BUILDLINK_TREE+=       gcc44
-
-.if !defined(GCC44_BUILDLINK3_MK)
-GCC44_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gcc44+=  gcc44>=${_GCC_REQD}
-BUILDLINK_ABI_DEPENDS.gcc44?=  gcc44>=4.4.0
-BUILDLINK_PKGSRCDIR.gcc44?=    ../../wip/gcc44
-.  if exists(${BUILDLINK_PREFIX.gcc44}/bin/gcc)
-_GNAT1!=${BUILDLINK_PREFIX.gcc44}/bin/gcc -print-prog-name=gnat1
-.    if exists(${_GNAT1})
-BUILDLINK_ENV+=        ADAC=${BUILDLINK_PREFIX.gcc44}/bin/gcc
-.    endif
-BUILDLINK_LIBDIRS.gcc44+=      lib
-_GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc44}/bin/gcc --print-libgcc-file-name`
-.    if empty(_GCC_ARCHDIR:M*not_found*)
-BUILDLINK_LIBDIRS.gcc44+=      ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/
-.      if exists(${_GNAT1})
-BUILDLINK_LIBDIRS.gcc44+=      ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/adalib
-.      endif
-BUILDLINK_INCDIRS.gcc44+=      include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/include
-.    endif
-.  endif
-
-BUILDLINK_FILES_CMD.gcc44=     \
-       (cd  ${BUILDLINK_PREFIX.gcc44} &&       \
-       ${FIND} bin libexec lib \( -type f -o -type l \) -print)
-BUILDLINK_FNAME_TRANSFORM.gcc44=       -e s:\buildlink:buildlink/gcc44:
-
-# Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc+=      full
-.  else
-BUILDLINK_DEPMETHOD.gcc?=      build
-.  endif
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.endif # GCC44_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -gcc44
diff --git a/wip/gcc44/distinfo b/wip/gcc44/distinfo
deleted file mode 100644 (file)
index 872efdf..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.17 2006/04/05 11:03:59 shannonjr Exp $
-
-SHA1 (gcc-4.4.0.tar.bz2) = 9215af6beb900ca1eef1d6a40c3dabe990203b25
-RMD160 (gcc-4.4.0.tar.bz2) = 174989b1b6b35d0c10cfa9eee1b51948bf5c4fb3
-Size (gcc-4.4.0.tar.bz2) = 62708198 bytes
-SHA1 (patch-aa) = b7180161a0c9eb63738ebf9586e52591ef43c636
-SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88
-SHA1 (patch-cc) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12
-SHA1 (patch-da) = 86dc05e6ea977ad869e5d63beb493750ab01a807
-SHA1 (patch-db) = 831481496b5b5f246f51d9a4fe9314f07f81a842
diff --git a/wip/gcc44/files/dragonfly-spec.h b/wip/gcc44/files/dragonfly-spec.h
deleted file mode 100644 (file)
index ace9e19..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-/* $DragonFly: src/gnu/usr.bin/cc41/cc_prep/config/dragonfly-spec.h,v 1.5 2008/07/24 21:45:10 corecode Exp $ */
-
-/* Base configuration file for all DragonFly targets.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Common DragonFly configuration. 
-   All DragonFly architectures should include this file, which will specify
-   their commonalities.
-
-   Adapted from gcc/config/freebsd-spec.h by
-   Joerg Sonnenberger <joerg@bec.de>
-
-   Adapted from gcc/config/freebsd.h by 
-   David O'Brien <obrien@FreeBSD.org>
-   Loren J. Rittle <ljrittle@acm.org>.  */
-
-
-/* This defines which switch letters take arguments.  On DragonFly, most of
-   the normal cases (defined in gcc.c) apply, and we also have -h* and
-   -z* options (for the linker) (coming from SVR4).
-   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc.  */
-
-#define DFBSD_SWITCH_TAKES_ARG(CHAR)                                   \
-  (DEFAULT_SWITCH_TAKES_ARG (CHAR)                                     \
-    || (CHAR) == 'h'                                                   \
-    || (CHAR) == 'z' /* ignored by ld */                               \
-    || (CHAR) == 'R')
-
-/* This defines which multi-letter switches take arguments.  */
-
-#define DFBSD_WORD_SWITCH_TAKES_ARG(STR)                                       \
-  (DEFAULT_WORD_SWITCH_TAKES_ARG (STR)                                 \
-   || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link")                \
-   || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym")           \
-   || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
-
-#define DFBSD_TARGET_OS_CPP_BUILTINS()                                 \
-  do                                                                   \
-    {                                                                  \
-       if (DFBSD_MAJOR == 3)                                   \
-         builtin_define ("__DragonFly__=3");                           \
-       else if (DFBSD_MAJOR == 2)                                      \
-         builtin_define ("__DragonFly__=2");                           \
-       else if (DFBSD_MAJOR == 1)                                      \
-         builtin_define ("__DragonFly__=1");                           \
-       else                                                            \
-         builtin_define ("__DragonFly__");                             \
-       builtin_define ("__DragonFly_cc_version=100001");               \
-       builtin_define_std ("unix");                                    \
-       builtin_define ("__KPRINTF_ATTRIBUTE__");                       \
-       builtin_assert ("system=unix");                                 \
-       builtin_assert ("system=bsd");                                  \
-       builtin_assert ("system=DragonFly");                            \
-       DFBSD_TARGET_CPU_CPP_BUILTINS();                                        \
-    }                                                                  \
-  while (0)
-
-/* Define the default DragonFly-specific per-CPU hook code. */
-#define DFBSD_TARGET_CPU_CPP_BUILTINS() do {} while (0)
-
-/* Provide a CPP_SPEC appropriate for DragonFly.  We just deal with the GCC 
-   option `-posix', and PIC issues.  */
-
-#define DFBSD_CPP_SPEC "                                                       \
-  %(cpp_cpu)                                                           \
-  %{fPIC|fpic|fPIE|fpie:-D__PIC__ -D__pic__}                           \
-  %{posix:-D_POSIX_SOURCE}"
-
-/* Provide a STARTFILE_SPEC appropriate for DragonFly.  Here we add
-   the magical crtbegin.o file (see crtstuff.c) which provides part 
-       of the support for getting C++ file-scope static object constructed 
-       before entering `main'.  */
-   
-#define DFBSD_STARTFILE_SPEC \
-  "%{!shared: \
-     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
-                      %{!p:%{profile:gcrt1.o%s} \
-                        %{!profile:crt1.o%s}}}} \
-   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
-
-/* Provide a ENDFILE_SPEC appropriate for DragonFly.  Here we tack on
-   the magical crtend.o file (see crtstuff.c) which provides part of 
-       the support for getting C++ file-scope static object constructed 
-       before entering `main', followed by a normal "finalizer" file, 
-       `crtn.o'.  */
-
-#define DFBSD_ENDFILE_SPEC \
-  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-
-/* Provide a LIB_SPEC appropriate for DragonFly as configured and as
-   required by the user-land thread model.  Select the appropriate libc,
-   depending on whether we're doing profiling or need threads support.
-   Make it a hard error if -pthread is provided on the command line and gcc
-   was configured with --disable-threads (this will help avoid bug
-   reports from users complaining about threading when they
-   misconfigured the gcc bootstrap but are later consulting DragonFly
-   manual pages that refer to the mythical -pthread option).  */
-
-/* Provide a LIB_SPEC appropriate for DragonFly.  Just select the appropriate
-   libc, depending on whether we're doing profiling or need threads support.
-   (simular to the default, except no -lg, and no -p).  */
-
-#ifdef DFBSD_NO_THREADS
-#define DFBSD_LIB_SPEC "                                               \
-  %{pthread: %eThe -pthread option is only supported on DragonFly when gcc \
-is built with the --enable-threads configure-time option.}             \
-  %{!nostdlib{!nostartfiles{!nolibc: -lc}}}                            \
-  }"
-#else
-#define DFBSD_LIB_SPEC "                                               \
-  %{pthread:-lpthread}                                                 \
-  %{!nostdlib: %{!nostartfiles: %{!nolibc: -lc}}}                      \
-  "
-#endif
-
-#define        DFBSD_DYNAMIC_LINKER            "/usr/libexec/ld-elf.so.2"
-
-#if 0
-#define LINK_LIBGCC_SPEC ""
-#define LIBGCC_SPEC "%{shared: -lgcc_pic} %{!shared: -lgcc}"
-
-#define PRE_LIB_SPEC "                                                 \
-  %{pg: -L"PREFIX2"/lib/gcc41/profiling                                \
-    %{!static: -rpath /usr/lib/gcc41/profiling                                 \
-      -rpath-link "PREFIX2"/lib/gcc41/profiling}}                      \
-  %{g: -L"PREFIX2"/lib/gcc41/debug                                     \
-    %{!static: -rpath /usr/lib/gcc41/debug                             \
-      -rpath-link "PREFIX2"/lib/gcc41/debug}}                          \
-  -L"PREFIX2"/lib/gcc41                                                        \
-  %{!static: -rpath /usr/lib/gcc41  -rpath-link "PREFIX2"/lib/gcc41}   \
-  %{pg: -L"PREFIX2"/lib/profiling                                      \
-    %{!static: -rpath /usr/lib/profiling                               \
-      -rpath-link "PREFIX2"/lib/profiling}}                            \
-  %{g: -L"PREFIX2"/lib/debug                                           \
-    %{!static: -rpath /usr/lib/debug -rpath-link "PREFIX2"/lib/debug}}         \
-  %{!static: -rpath /usr/lib -rpath-link "PREFIX2"/lib}                \
-  "
-
-#define DFBSD_LINK_COMMAND_SPEC "\
-%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
-    %(linker) %l " LINK_PIE_SPEC "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
-    %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
-    %{static:} %{L*} %(link_libgcc) %o \
-    %{fprofile-arcs|fprofile-generate: -lgcov}\
-    %{!nostdlib:%{!nodefaultlibs:%(pre_lib)}}\
-    %{!nostdlib:%{!nodefaultlibs:%(link_gcc_c_sequence)}}\
-    %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}"
-
-#ifndef PREFIX2
-#define        PREFIX2         "/usr"
-#endif
-
-#ifndef STANDARD_STARTFILE_PREFIX_1
-#define        STANDARD_STARTFILE_PREFIX_1     PREFIX2"/lib/gcc41/"
-#endif
-#ifndef STANDARD_EXEC_PREFIX
-#define        STANDARD_EXEC_PREFIX            PREFIX2"/libexec/gcc41/"
-#endif
-#ifndef STANDARD_STARTFILE_PREFIX
-#define        STANDARD_STARTFILE_PREFIX       PREFIX2"/lib/"
-#endif
-#ifndef TOOLDIR_BASE_PREFIX
-#define TOOLDIR_BASE_PREFIX            PREFIX2"/libexec/gcc41"
-#endif
-#ifndef STANDARD_BINDIR_PREFIX
-#define STANDARD_BINDIR_PREFIX         PREFIX2"/libexec/gcc41"
-#endif
-#ifndef STANDARD_LIBEXEC_PREFIX
-#define STANDARD_LIBEXEC_PREFIX                PREFIX2"/libexec/gcc41"
-#endif
-
-#ifndef GPLUSPLUS_INCLUDE_DIR
-#define GPLUSPLUS_INCLUDE_DIR          PREFIX2"/include/c++"
-#endif
-#ifndef GPLUSPLUS_TOOL_INCLUDE_DIR
-#define GPLUSPLUS_TOOL_INCLUDE_DIR     PREFIX2"/include/c++/4.1"
-#endif
-#ifndef GPLUSPLUS_BACKWARD_INCLUDE_DIR
-#define        GPLUSPLUS_BACKWARD_INCLUDE_DIR  PREFIX2"/include/c++/4.1/backward"
-#endif
-#ifndef GCC_LOCAL_INCLUDE_DIR
-#define        GCC_LOCAL_INCLUDE_DIR           PREFIX2"/libdata/gcc41"
-#endif
-#ifndef GCC_INCLUDE_DIR
-#define        GCC_INCLUDE_DIR                 PREFIX2"/include"
-#endif
-
-#undef INCLUDE_DEFAULTS
-#define INCLUDE_DEFAULTS                               \
-  {                                                    \
-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },            \
-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 },    \
-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 },        \
-    { GCC_INCLUDE_DIR, "GCC", 0, 0 },                  \
-    { GCC_LOCAL_INCLUDE_DIR, "GCC", 0, 0 },            \
-    { NULL, NULL, 0, 0 }                               \
-  }
-#endif
diff --git a/wip/gcc44/files/dragonfly.h b/wip/gcc44/files/dragonfly.h
deleted file mode 100644 (file)
index 6274620..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $DragonFly: src/gnu/usr.bin/cc41/cc_prep/config/dragonfly.h,v 1.2 2008/05/19 10:46:39 corecode Exp $ */
-
-/* Base configuration file for all DragonFly targets.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Common DragonFly configuration. 
-   All DragonFly architectures should include this file, which will specify
-   their commonalities.
-
-   Adapted from gcc/config/freebsd.h by
-   Joerg Sonnenberger <joerg@bec.de>
-
-   Adapted from gcc/config/i386/freebsd-elf.h by 
-   David O'Brien <obrien@FreeBSD.org>.  
-   Further work by David O'Brien <obrien@FreeBSD.org> and
-   Loren J. Rittle <ljrittle@acm.org>.  */
-
-
-/* This defines which switch letters take arguments.  On DragonFly, most of
-   the normal cases (defined in gcc.c) apply, and we also have -h* and
-   -z* options (for the linker) (coming from SVR4).
-   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc.  */
-
-#undef  SWITCH_TAKES_ARG
-#define SWITCH_TAKES_ARG(CHAR) (DFBSD_SWITCH_TAKES_ARG(CHAR))
-
-#undef  WORD_SWITCH_TAKES_ARG
-#define WORD_SWITCH_TAKES_ARG(STR) (DFBSD_WORD_SWITCH_TAKES_ARG(STR))
-
-#undef  TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() DFBSD_TARGET_OS_CPP_BUILTINS()
-
-#undef  CPP_SPEC
-#define CPP_SPEC DFBSD_CPP_SPEC
-
-#undef  STARTFILE_SPEC
-#define STARTFILE_SPEC DFBSD_STARTFILE_SPEC
-
-#undef  ENDFILE_SPEC
-#define ENDFILE_SPEC DFBSD_ENDFILE_SPEC
-
-#undef  LIB_SPEC
-#define LIB_SPEC DFBSD_LIB_SPEC
-
-#if 0
-#undef LINK_COMMAND_SPEC
-#define LINK_COMMAND_SPEC DFBSD_LINK_COMMAND_SPEC 
-#endif
-
-/************************[  Target stuff  ]***********************************/
-
-/* All DragonFly Architectures support the ELF object file format.  */
-#undef  OBJECT_FORMAT_ELF
-#define OBJECT_FORMAT_ELF
-
-/* Don't assume anything about the header files.  */
-#undef  NO_IMPLICIT_EXTERN_C
-#define NO_IMPLICIT_EXTERN_C   1
-
-/* Make gcc agree with DragonFly's standard headers (<machine/stdint.h>, etc...)  */
-
-#undef  WCHAR_TYPE
-#define WCHAR_TYPE "int"
-
-#define MATH_LIBRARY_PROFILE    "-lm_p"
-
-/* Code generation parameters.  */
-
-/* Use periods rather than dollar signs in special g++ assembler names.
-   This ensures the configuration knows our system correctly so we can link
-   with libraries compiled with the native cc.  */
-#undef NO_DOLLAR_IN_LABEL
-
-/* Define this so we can compile MS code for use with WINE.  */
-#define HANDLE_PRAGMA_PACK_PUSH_POP
-
-/* Used by libgcc2.c.  We support file locking with fcntl / F_SETLKW.
-   This enables the test coverage code to use file locking when exiting a
-   program, which avoids race conditions if the program has forked.  */
-#define TARGET_POSIX_IO
diff --git a/wip/gcc44/files/i386-dragonfly.h b/wip/gcc44/files/i386-dragonfly.h
deleted file mode 100644 (file)
index 78b7e0c..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/* $DragonFly: src/gnu/usr.bin/cc41/cc_prep/config/i386/dragonfly.h,v 1.1 2006/09/27 12:10:34 corecode Exp $ */
-
-/* Definitions for Intel 386 running DragonFly with ELF format
-   
-   Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc.
-   Contributed by Eric Youngdale.
-   Modified for stabs-in-ELF by H.J. Lu.
-   Adapted from GNU/Linux version by John Polstra.
-   Continued development by David O'Brien <obrien@freebsd.org>
-   Adapted from the FreeBSD version.
-
-   Changes:
-   - remove support for changing the dynamic linker
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-
-#define TARGET_VERSION fprintf (stderr, " (i386 DragonFly/ELF)");
-
-/* Override the default comment-starter of "/".  */
-#undef  ASM_COMMENT_START
-#define ASM_COMMENT_START "#"
-
-#undef  ASM_APP_ON
-#define ASM_APP_ON "#APP\n"
-
-#undef  ASM_APP_OFF
-#define ASM_APP_OFF "#NO_APP\n"
-
-#undef  DBX_REGISTER_NUMBER
-#define DBX_REGISTER_NUMBER(n) \
-  (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n])
-
-#undef  NO_PROFILE_COUNTERS
-#define NO_PROFILE_COUNTERS    1
-
-/* Tell final.c that we don't need a label passed to mcount.  */
-
-#undef  MCOUNT_NAME
-#define MCOUNT_NAME ".mcount"
-
-/* Make gcc agree with <machine/ansi.h>.  */
-
-#undef  SIZE_TYPE
-#define SIZE_TYPE      (TARGET_64BIT ? "long unsigned int" : "unsigned int")
-#undef  PTRDIFF_TYPE
-#define PTRDIFF_TYPE   (TARGET_64BIT ? "long int" : "int")
-  
-#undef  WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE        (TARGET_64BIT ? 32 : BITS_PER_WORD)
-
-#undef  SUBTARGET_EXTRA_SPECS  /* i386.h bogusly defines it.  */
-#define SUBTARGET_EXTRA_SPECS \
-  { "dfbsd_dynamic_linker", DFBSD_DYNAMIC_LINKER }
-    
-/* Provide a STARTFILE_SPEC appropriate for DragonFly.  Here we add
-   the magical crtbegin.o file (see crtstuff.c) which provides part 
-       of the support for getting C++ file-scope static object constructed 
-       before entering `main'.  */
-   
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC \
-  "%{!shared: \
-     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
-                      %{!p:%{profile:gcrt1.o%s} \
-                        %{!profile:crt1.o%s}}}} \
-   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
-
-/* Provide a ENDFILE_SPEC appropriate for DragonFly.  Here we tack on
-   the magical crtend.o file (see crtstuff.c) which provides part of 
-       the support for getting C++ file-scope static object constructed 
-       before entering `main', followed by a normal "finalizer" file, 
-       `crtn.o'.  */
-
-#undef ENDFILE_SPEC
-#define ENDFILE_SPEC \
-  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-
-/* Provide a LINK_SPEC appropriate for DragonFly.  Here we provide support
-   for the special GCC options -static and -shared, which allow us to
-   link things in one of these three modes by applying the appropriate
-   combinations of options at link-time. We like to support here for
-   as many of the other GNU linker options as possible. But I don't
-   have the time to search for those flags. I am sure how to add
-   support for -soname shared_object_name. H.J.
-
-   I took out %{v:%{!V:-V}}. It is too much :-(. They can use
-   -Wl,-V.
-
-   When the -shared link option is used a final link is not being
-   done.  */
-
-#undef LINK_SPEC
-#define LINK_SPEC "\
-  %{p:%nconsider using `-pg' instead of `-p' with gprof(1)} \
-  %{v:-V} \
-  %{assert*} %{R*} %{rpath*} %{defsym*} \
-  %{shared:-Bshareable %{h*} %{soname*}} \
-    %{!shared: \
-      %{!static: \
-        %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker %(dfbsd_dynamic_linker) }} \
-    %{static:-Bstatic}} \
-  %{symbolic:-Bsymbolic}"
-
-/* A C statement to output to the stdio stream FILE an assembler
-   command to advance the location counter to a multiple of 1<<LOG
-   bytes if it is within MAX_SKIP bytes.
-
-   This is used to align code labels according to Intel recommendations.  */
-
-#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
-#undef  ASM_OUTPUT_MAX_SKIP_ALIGN
-#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP)                                 \
-  if ((LOG) != 0) {                                                                                                            \
-    if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG));   \
-    else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP));   \
-  }
-#endif
-
-/* Don't default to pcc-struct-return, we want to retain compatibility with
-   older gcc versions AND pcc-struct-return is nonreentrant.
-   (even though the SVR4 ABI for the i386 says that records and unions are
-   returned in memory).  */
-
-#undef  DEFAULT_PCC_STRUCT_RETURN
-#define DEFAULT_PCC_STRUCT_RETURN 0
-
-/* DragonFly sets the rounding precision of the FPU to 53 bits.  Let the
-   compiler get the contents of <float.h> and std::numeric_limits correct.  */
-#undef TARGET_96_ROUND_53_LONG_DOUBLE
-#define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT)
diff --git a/wip/gcc44/files/i386-dragonfly64.h b/wip/gcc44/files/i386-dragonfly64.h
deleted file mode 100644 (file)
index f423653..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $DragonFly: src/gnu/usr.bin/cc41/cc_prep/config/i386/dragonfly64.h,v 1.1 2007/01/15 17:53:16 corecode Exp $ */
-
-/* Definitions for AMD x86-64 running DragonFly with ELF format
-   Copyright (C) 2002 Free Software Foundation, Inc.
-   Contributed by David O'Brien <obrien@FreeBSD.org>
-   Adapted from the FreeBSD version.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.9 2004/07/28 04:44:23 kan Exp $ */
-
-
-#undef  TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (x86-64 DragonFly/ELF)");
-
-/* Tell final.c that we don't need a label passed to mcount.  */
-
-#define SUBTARGET_EXTRA_SPECS \
-  { "dfbsd_dynamic_linker", DFBSD_DYNAMIC_LINKER }
-
-#undef  MCOUNT_NAME
-#define MCOUNT_NAME ".mcount"
-
-/* Provide a LINK_SPEC appropriate for the DragonFly/x86-64 ELF target.
-   This is a copy of LINK_SPEC from <i386/dragonfly.h> tweaked for
-   the x86-64 target.
-   XXX We don't support two arch userland yet  */
-
-#undef LINK_SPEC
-#define LINK_SPEC "\
-  %{v:-V} \
-  %{assert*} %{R*} %{rpath*} %{defsym*} \
-  %{shared:-Bshareable %{h*} %{soname*}} \
-    %{!shared: \
-      %{!static: \
-        %{rdynamic:-export-dynamic} \
-       %{!dynamic-linker:-dynamic-linker %(dfbsd_dynamic_linker) }} \
-    %{static:-Bstatic}} \
-  %{symbolic:-Bsymbolic}"
diff --git a/wip/gcc44/patches/patch-aa b/wip/gcc44/patches/patch-aa
deleted file mode 100644 (file)
index 66b57e0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
---- gcc/config.gcc.orig        2009-04-17 13:58:41 +0200
-+++ gcc/config.gcc
-@@ -482,6 +482,33 @@ case ${target} in
-   esac
-   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
-   ;;
-+*-*-dragonfly*)
-+  gas=yes
-+  gnu_ld=yes
-+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+  case ${target} in
-+    *-*-dragonfly1 | *-*-dragonfly[1].*)
-+      tm_defines="${tm_defines} DFBSD_MAJOR=1" ;;
-+    *-*-dragonfly2 | *-*-dragonfly[2].*)
-+      tm_defines="${tm_defines} DFBSD_MAJOR=2" ;;
-+    *-*-dragonfly3 | *-*-dragonfly[3].*)
-+      tm_defines="${tm_defines} DFBSD_MAJOR=3" ;;
-+    *-*-dragonfly4 | *-*-dragonfly[4].*)
-+      tm_defines="${tm_defines} DFBSD_MAJOR=4" ;;
-+    *)
-+      echo 'Please update *-*-dragonfly* in gcc/config.gcc'
-+      exit 1
-+      ;;
-+  esac
-+  tmake_file="t-slibgcc-elf-ver t-dragonfly"
-+  case ${enable_threads} in
-+    "" | yes | posix)
-+      thread_file='posix'
-+      tmake_file="${tmake_file} t-dragonfly-thread"
-+      ;;
-+  esac
-+  dfbsd_tm_file="${dfbsd_tm_file} dragonfly-spec.h dragonfly.h"
-+  ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
-   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-   gas=yes
-@@ -1047,6 +1074,12 @@ x86_64-*-freebsd*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
-       tmake_file="${tmake_file} i386/t-crtstuff"
-       ;;
-+i[34567]86-*-dragonfly*)
-+      tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/dragonfly.h"
-+      ;;
-+x86_64-*-dragonfly*)
-+      tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfbsd_tm_file} i386/x86-64.h i386/dragonfly.h i386/dragonfly64.h"
-+      ;;
- i[34567]86-*-netbsdelf*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-       ;;
diff --git a/wip/gcc44/patches/patch-ab b/wip/gcc44/patches/patch-ab
deleted file mode 100644 (file)
index 4a9fb7f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- libgcc/config.host.orig    2009-04-17 13:58:41 +0200
-+++ libgcc/config.host
-@@ -149,6 +149,8 @@ case ${host} in
-   # machine-specific sections may refine and add to this
-   # configuration.
-   ;;
-+*-*-dragonfly*)
-+  ;;
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu*)
-   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-   ;;
-@@ -281,6 +283,10 @@ i[34567]86-*-freebsd*)
-       ;;
- x86_64-*-freebsd*)
-       ;;
-+i[34567]86-*-dragonfly*)
-+      ;;
-+x86_64-*-dragonfly*)
-+      ;;
- i[34567]86-*-netbsdelf*)
-       ;;
- i[34567]86-*-netbsd*)
diff --git a/wip/gcc44/patches/patch-cc b/wip/gcc44/patches/patch-cc
deleted file mode 100644 (file)
index 56812e8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2004/11/05 12:40:23 shannonjr Exp $
-
---- gcc/Makefile.in.orig       2004-06-17 15:56:58.000000000 -0600
-+++ gcc/Makefile.in
-@@ -1390,6 +1390,7 @@ c-pch.o : c-pch.c $(CONFIG_H) $(SYSTEM_H
- # Language-independent files.
- DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(exec_prefix)/lib\"" \
-   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
-   -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
diff --git a/wip/gcc44/patches/patch-da b/wip/gcc44/patches/patch-da
deleted file mode 100644 (file)
index 112608a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- configure.orig     2009-04-21 11:08:08 +0200
-+++ configure
-@@ -4532,7 +4532,7 @@ if test "${with_mpfr_lib+set}" = set; th
- fi;
- if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-L$with_mpfr/lib -Wl,-R${PREFIX}/lib $gmplibs"
-   gmpinc="-I$with_mpfr/include"
- fi
- if test "x$with_mpfr_include" != x; then
diff --git a/wip/gcc44/patches/patch-db b/wip/gcc44/patches/patch-db
deleted file mode 100644 (file)
index 7980fa6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- gcc/Makefile.in.orig       2009-05-27 00:57:20 +0200
-+++ gcc/Makefile.in
-@@ -310,7 +310,6 @@ USER_H = $(srcdir)/ginclude/float.h \
-        $(srcdir)/ginclude/iso646.h \
-        $(srcdir)/ginclude/stdarg.h \
-        $(srcdir)/ginclude/stdbool.h \
--       $(srcdir)/ginclude/stddef.h \
-        $(srcdir)/ginclude/varargs.h \
-        $(srcdir)/ginclude/stdfix.h \
-        $(EXTRA_HEADERS)
index 33af7d0..126ad0d 100644 (file)
@@ -1,3 +1,2 @@
 @comment $NetBSD$
 lib/mpg123/output_oss.la
-@comment in mpg123: @dirrm lib/mpg123
index 6cb664d..18d9aea 100644 (file)
@@ -1,3 +1,2 @@
 @comment $NetBSD$
 lib/mpg123/output_sun.la
-@dirrm lib/mpg123
index c148abb..682437d 100644 (file)
@@ -29,12 +29,11 @@ MAKE_ENV+=          MPG123_SUBDIRS=${MPG123_SUBDIRS:Q}
 MAKE_ENV+=             MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q}
 
 .if !defined(MPG123_BUILDING_BASE)
+INSTALLATION_DIRS+=    lib/mpg123
 LIBS+=                 -lmpg123
 BUILD_DIRS=            src/output
 PATCHDIR=      ${.CURDIR}/../../wip/mpg123/patches
 do-install:
-       ${RUN} ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib &&            \
-               ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/mpg123 &&    \
        ${LIBTOOL} --mode=install ${INSTALL_LIB}                        \
                ${WRKSRC}/src/output/output_${MPG123_MODULE}.la         \
                ${DESTDIR}${PREFIX}/lib/mpg123
index 8a8ca7d..1363720 100644 (file)
@@ -5,4 +5,3 @@ lib/libmpg123.la
 lib/mpg123/output_dummy.la
 lib/pkgconfig/libmpg123.pc
 man/man1/mpg123.1
-@dirrm lib/mpg123
index 8f09c58..6922f52 100644 (file)
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=              smtp-gated-1.4.16
+DISTNAME=              smtp-gated-1.4.16.2
 # PKGNAME=             ${DISTNAME:S/-rc/rc/}
 CATEGORIES=            mail
 MASTER_SITES=          http://smtp-proxy.klolik.org/files/
@@ -9,6 +9,7 @@ MASTER_SITES=           http://smtp-proxy.klolik.org/files/
 MAINTAINER=            bartosz.kuzma@gmail.com
 HOMEPAGE=              http://smtp-proxy.klolik.org/
 COMMENT=               Proxy for SMTP sessions with virus and spam scan
+LICENSE=               gnu-gpl-v2
 
 SMTP_GATED_GROUP?=     smtpgw
 SMTP_GATED_USER?=      smtpgw
@@ -38,18 +39,19 @@ EGDIR=                      ${PREFIX}/share/examples/smtp-gated
 CONF_FILES=            ${EGDIR}/smtp-gated.conf \
                        ${PKG_SYSCONFDIR}/smtp-gated.conf
 RCD_SCRIPTS=           smtp_gated
-
 USE_TOOLS+=            gmake
 
 GNU_CONFIGURE=         yes
 
+PKG_DESTDIR_SUPPORT=    user-destdir
+
 post-extract:
        ${CP} ${FILESDIR}/smtp-gated.conf ${WRKDIR}
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README.PL ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKDIR}/smtp-gated.conf ${EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.PL ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKDIR}/smtp-gated.conf ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
index 9657fe5..b15dde2 100644 (file)
@@ -5,5 +5,5 @@ sbin/smtp-gated
 share/doc/smtp-gated/README.PL
 share/examples/rc.d/smtp_gated
 share/examples/smtp-gated/smtp-gated.conf
-@dirrm share/doc/smtp-gated
-@dirrm share/examples/smtp-gated
+@pkgdir share/doc/smtp-gated
+@pkgdir share/examples/smtp-gated
index ef43904..ed9e3c8 100644 (file)
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (smtp-gated-1.4.16.tar.gz) = b8636ad403c7b413239adb8da4f43b57adff65da
-RMD160 (smtp-gated-1.4.16.tar.gz) = 1039b122ca68023fc8c8d3872cbfa14088433612
-Size (smtp-gated-1.4.16.tar.gz) = 363375 bytes
+SHA1 (smtp-gated-1.4.16.2.tar.gz) = a9c5faa7c70fd1ecd75ac5e6c80764a8ffb1cc93
+RMD160 (smtp-gated-1.4.16.2.tar.gz) = 047b0b953ce7f320115c4f5d854fc1874c81efbc
+Size (smtp-gated-1.4.16.2.tar.gz) = 364265 bytes
 SHA1 (patch-ab) = b0c65a2233679a98f80eb467d4040a4d900d0aba
index 7f9b1a1..75dfd4d 100644 (file)
@@ -8,21 +8,27 @@ MASTER_SITES=         http://vegan.net/tony/supersmack/
 MAINTAINER=            bartosz.kuzma@gmail.com
 HOMEPAGE=              http://vegan.net/tony/supersmack/
 COMMENT=               Database benchmarking tool
+LICENSE=               gnu-gpl-v2
 
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
+PKG_DESTDIR_SUPPORT=    user-destdir
+
 CONFIGURE_ARGS+=       --with-datadir=/tmp
-CONFIGURE_ARGS+=       --with-smacks-dir=${PREFIX}/share/smacks
+CONFIGURE_ARGS+=       --with-smacks-dir=${DESTDIR}${PREFIX}/share/smacks
+
+DOCDIR=                        ${PREFIX}/share/doc/super-smack
 
 .include "options.mk"
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/super-smack
-       ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/super-smack
-       ${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/super-smack
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/super-smack
-       ${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${PREFIX}/share/doc/super-smack
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/CHANGES \
+               ${WRKSRC}/MANUAL \
+               ${WRKSRC}/README \
+               ${WRKSRC}/TUTORIAL \
+               ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
index 7688dfa..3bf6931 100644 (file)
@@ -7,5 +7,5 @@ share/doc/super-smack/README
 share/doc/super-smack/TUTORIAL
 share/smacks/select-key.smack
 share/smacks/update-select.smack
-@dirrm share/smacks
-@dirrm share/doc/super-smack
+@pkgdir share/smacks
+@pkgdir share/doc/super-smack
diff --git a/wip/tellico/DESCR b/wip/tellico/DESCR
new file mode 100644 (file)
index 0000000..1771e0a
--- /dev/null
@@ -0,0 +1,17 @@
+Tellico is a KDE application for organizing your collections. It
+provides default templates for books, bibliographies, videos, music,
+video games, coins, stamps, trading cards, comic books, and wines.
+
+Tellico allows you to enter your collection in a catalogue database,
+saving many different properties like title, author, etc. Two
+different views of your collection are shown. On the left, your
+entries are grouped together by any field you like, allowing you
+to see how many are in each group. On the right, selected fields
+are shown in column format, allowing you to sort by any field. On
+the bottom is a customizable HTML view of the current entry. The
+entry editor is a dialog box where you enter the data. Check out
+the screenshots.
+
+Tellico keeps things simple, so no database server is needed. The
+data is saved in XML format, which makes for easy parsing, portability,
+and styling.
diff --git a/wip/tellico/Makefile b/wip/tellico/Makefile
new file mode 100644 (file)
index 0000000..58f950f
--- /dev/null
@@ -0,0 +1,36 @@
+# $NetBSD$
+#
+
+DISTNAME=      tellico-2.0
+CATEGORIES=    misc
+MASTER_SITES=  http://tellico-project.org/files/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users@NetBSD.org
+HOMEPAGE=      http://tellico-project.org/
+COMMENT=       Collection manager for KDE
+LICENSE=       gnu-gpl-v2
+
+BUILD_DEPENDS+=        automoc4-[0-9]*:../../devel/automoc4
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+MAKE_JOBS_SAFE=        no
+USE_LANGUAGES= c c++
+USE_CMAKE=     yes
+USE_TOOLS+=    msgfmt pkg-config
+
+pre-build:
+       cd ${WRKSRC}/src/core && ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}
+
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../devel/exempi/buildlink3.mk"
+.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../net/yaz/buildlink3.mk"
+.include "../../print/poppler-qt4/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../wip/kdelibs4/buildlink3.mk"
+.include "../../wip/kdegraphics4/buildlink3.mk"
+.include "../../wip/kdemultimedia4/buildlink3.mk"
+.include "../../wip/kdepimlibs4/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/tellico/PLIST b/wip/tellico/PLIST
new file mode 100644 (file)
index 0000000..1d7b55b
--- /dev/null
@@ -0,0 +1,227 @@
+@comment $NetBSD$
+bin/tellico
+share/applications/kde4/tellico.desktop
+share/doc/kde/HTML/en/tellico/advanced.docbook
+share/doc/kde/HTML/en/tellico/amazon-options.png
+share/doc/kde/HTML/en/tellico/common
+share/doc/kde/HTML/en/tellico/configuration.docbook
+share/doc/kde/HTML/en/tellico/csv-dialog.png
+share/doc/kde/HTML/en/tellico/details.docbook
+share/doc/kde/HTML/en/tellico/entry-editor1.png
+share/doc/kde/HTML/en/tellico/entry-editor3.png
+share/doc/kde/HTML/en/tellico/entry-editor4.png
+share/doc/kde/HTML/en/tellico/entry-editor5.png
+share/doc/kde/HTML/en/tellico/export-bibtex.png
+share/doc/kde/HTML/en/tellico/export-csv.png
+share/doc/kde/HTML/en/tellico/export-html.png
+share/doc/kde/HTML/en/tellico/export-options.png
+share/doc/kde/HTML/en/tellico/export-pdb.png
+share/doc/kde/HTML/en/tellico/externalexec-options.png
+share/doc/kde/HTML/en/tellico/faqs.docbook
+share/doc/kde/HTML/en/tellico/fetch-dialog.png
+share/doc/kde/HTML/en/tellico/fields-dialog.png
+share/doc/kde/HTML/en/tellico/filter-dialog.png
+share/doc/kde/HTML/en/tellico/filter-view.png
+share/doc/kde/HTML/en/tellico/fundamentals.docbook
+share/doc/kde/HTML/en/tellico/general-options.png
+share/doc/kde/HTML/en/tellico/hacking.docbook
+share/doc/kde/HTML/en/tellico/imdb-options.png
+share/doc/kde/HTML/en/tellico/importing-exporting.docbook
+share/doc/kde/HTML/en/tellico/index.cache.bz2
+share/doc/kde/HTML/en/tellico/index.docbook
+share/doc/kde/HTML/en/tellico/loan-dialog.png
+share/doc/kde/HTML/en/tellico/loan-view.png
+share/doc/kde/HTML/en/tellico/main-window.png
+share/doc/kde/HTML/en/tellico/menus.docbook
+share/doc/kde/HTML/en/tellico/print-options.png
+share/doc/kde/HTML/en/tellico/report-dialog.png
+share/doc/kde/HTML/en/tellico/source-options.png
+share/doc/kde/HTML/en/tellico/sru-options.png
+share/doc/kde/HTML/en/tellico/template-options.png
+share/doc/kde/HTML/en/tellico/z3950-options.png
+share/doc/kde/HTML/fr/tellico/advanced.docbook
+share/doc/kde/HTML/fr/tellico/common
+share/doc/kde/HTML/fr/tellico/configuration.docbook
+share/doc/kde/HTML/fr/tellico/details.docbook
+share/doc/kde/HTML/fr/tellico/faqs.docbook
+share/doc/kde/HTML/fr/tellico/fundamentals.docbook
+share/doc/kde/HTML/fr/tellico/hacking.docbook
+share/doc/kde/HTML/fr/tellico/importing-exporting.docbook
+share/doc/kde/HTML/fr/tellico/index.cache.bz2
+share/doc/kde/HTML/fr/tellico/index.docbook
+share/doc/kde/HTML/fr/tellico/menus.docbook
+share/doc/kde/HTML/sv/tellico/advanced.docbook
+share/doc/kde/HTML/sv/tellico/common
+share/doc/kde/HTML/sv/tellico/configuration.docbook
+share/doc/kde/HTML/sv/tellico/details.docbook
+share/doc/kde/HTML/sv/tellico/faqs.docbook
+share/doc/kde/HTML/sv/tellico/fundamentals.docbook
+share/doc/kde/HTML/sv/tellico/hacking.docbook
+share/doc/kde/HTML/sv/tellico/importing-exporting.docbook
+share/doc/kde/HTML/sv/tellico/index.cache.bz2
+share/doc/kde/HTML/sv/tellico/index.docbook
+share/doc/kde/HTML/sv/tellico/menus.docbook
+share/doc/kde/HTML/uk/tellico/advanced.docbook
+share/doc/kde/HTML/uk/tellico/common
+share/doc/kde/HTML/uk/tellico/configuration.docbook
+share/doc/kde/HTML/uk/tellico/details.docbook
+share/doc/kde/HTML/uk/tellico/faqs.docbook
+share/doc/kde/HTML/uk/tellico/fundamentals.docbook
+share/doc/kde/HTML/uk/tellico/hacking.docbook
+share/doc/kde/HTML/uk/tellico/importing-exporting.docbook
+share/doc/kde/HTML/uk/tellico/index.cache.bz2
+share/doc/kde/HTML/uk/tellico/index.docbook
+share/doc/kde/HTML/uk/tellico/menus.docbook
+share/icons/hicolor/128x128/apps/tellico.png
+share/icons/hicolor/128x128/mimetypes/application-x-tellico.png
+share/icons/hicolor/16x16/apps/tellico.png
+share/icons/hicolor/16x16/mimetypes/application-x-tellico.png
+share/icons/hicolor/22x22/apps/tellico.png
+share/icons/hicolor/22x22/mimetypes/application-x-tellico.png
+share/icons/hicolor/32x32/apps/tellico.png
+share/icons/hicolor/32x32/mimetypes/application-x-tellico.png
+share/icons/hicolor/48x48/apps/tellico.png
+share/icons/hicolor/48x48/mimetypes/application-x-tellico.png
+share/icons/hicolor/64x64/apps/tellico.png
+share/icons/hicolor/64x64/mimetypes/application-x-tellico.png
+share/kde/apps/kconf_update/tellico-1-3-update.pl
+share/kde/apps/kconf_update/tellico-rename.upd
+share/kde/apps/kconf_update/tellico.upd
+share/kde/apps/tellico/MARC21slim2MODS3.xsl
+share/kde/apps/tellico/MARC21slimUtils.xsl
+share/kde/apps/tellico/UNIMARC2MODS3.xsl
+share/kde/apps/tellico/amazon2tellico.xsl
+share/kde/apps/tellico/arxiv2tellico.xsl
+share/kde/apps/tellico/bibtex-translation.xml
+share/kde/apps/tellico/bluray-logo.png
+share/kde/apps/tellico/cassette-logo.png
+share/kde/apps/tellico/cd-logo.png
+share/kde/apps/tellico/crossref2tellico.xsl
+share/kde/apps/tellico/data-sources/bedetheque.py
+share/kde/apps/tellico/data-sources/bedetheque.py.spec
+share/kde/apps/tellico/data-sources/boardgamegeek.rb
+share/kde/apps/tellico/data-sources/boardgamegeek.rb.spec
+share/kde/apps/tellico/data-sources/dark_horse_comics.py
+share/kde/apps/tellico/data-sources/dark_horse_comics.py.spec
+share/kde/apps/tellico/data-sources/fr.allocine.py
+share/kde/apps/tellico/data-sources/fr.allocine.py.spec
+share/kde/apps/tellico/data-sources/ministerio_de_cultura.py
+share/kde/apps/tellico/data-sources/ministerio_de_cultura.py.spec
+share/kde/apps/tellico/delicious2tellico.xsl
+share/kde/apps/tellico/dvd-logo.png
+share/kde/apps/tellico/entry-templates/Album.xsl
+share/kde/apps/tellico/entry-templates/Compact.xsl
+share/kde/apps/tellico/entry-templates/Default.xsl
+share/kde/apps/tellico/entry-templates/Fancy.xsl
+share/kde/apps/tellico/entry-templates/Video.xsl
+share/kde/apps/tellico/gcstar2tellico.xsl
+share/kde/apps/tellico/griffith2tellico.py
+share/kde/apps/tellico/hddvd-logo.png
+share/kde/apps/tellico/isbndb2tellico.xsl
+share/kde/apps/tellico/mods2tellico.xsl
+share/kde/apps/tellico/pics/README.icons
+share/kde/apps/tellico/pics/README.quesnay
+share/kde/apps/tellico/pics/album.png
+share/kde/apps/tellico/pics/bibtex.png
+share/kde/apps/tellico/pics/boardgame.png
+share/kde/apps/tellico/pics/book.png
+share/kde/apps/tellico/pics/card.png
+share/kde/apps/tellico/pics/checkmark.png
+share/kde/apps/tellico/pics/coin.png
+share/kde/apps/tellico/pics/comic.png
+share/kde/apps/tellico/pics/file.png
+share/kde/apps/tellico/pics/game.png
+share/kde/apps/tellico/pics/nocover_album.png
+share/kde/apps/tellico/pics/nocover_bibtex.png
+share/kde/apps/tellico/pics/nocover_boardgame.png
+share/kde/apps/tellico/pics/nocover_book.png
+share/kde/apps/tellico/pics/nocover_comic.png
+share/kde/apps/tellico/pics/nocover_game.png
+share/kde/apps/tellico/pics/nocover_video.png
+share/kde/apps/tellico/pics/person-open.png
+share/kde/apps/tellico/pics/person.png
+share/kde/apps/tellico/pics/script.png
+share/kde/apps/tellico/pics/script.svg
+share/kde/apps/tellico/pics/stamp.png
+share/kde/apps/tellico/pics/star_off.png
+share/kde/apps/tellico/pics/star_on.png
+share/kde/apps/tellico/pics/stars1.png
+share/kde/apps/tellico/pics/stars10.png
+share/kde/apps/tellico/pics/stars2.png
+share/kde/apps/tellico/pics/stars3.png
+share/kde/apps/tellico/pics/stars4.png
+share/kde/apps/tellico/pics/stars5.png
+share/kde/apps/tellico/pics/stars6.png
+share/kde/apps/tellico/pics/stars7.png
+share/kde/apps/tellico/pics/stars8.png
+share/kde/apps/tellico/pics/stars9.png
+share/kde/apps/tellico/pics/tellico.png
+share/kde/apps/tellico/pics/tellico.svg
+share/kde/apps/tellico/pics/tellico_mime.svg
+share/kde/apps/tellico/pics/video.png
+share/kde/apps/tellico/pics/wine.png
+share/kde/apps/tellico/pubmed2tellico.xsl
+share/kde/apps/tellico/record-logo.png
+share/kde/apps/tellico/referencer2tellico.xsl
+share/kde/apps/tellico/report-templates/Column_View.xsl
+share/kde/apps/tellico/report-templates/Group_Summary.xsl
+share/kde/apps/tellico/report-templates/Group_View.xsl
+share/kde/apps/tellico/report-templates/Image_List.xsl
+share/kde/apps/tellico/report-templates/Loan_View.xsl
+share/kde/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
+share/kde/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
+share/kde/apps/tellico/report-templates/Tri-Column.xsl
+share/kde/apps/tellico/shadowAlpha.png
+share/kde/apps/tellico/tellico-by-author.xsl
+share/kde/apps/tellico/tellico-by-title.xsl
+share/kde/apps/tellico/tellico-common.xsl
+share/kde/apps/tellico/tellico-printing.xsl
+share/kde/apps/tellico/tellico.dtd
+share/kde/apps/tellico/tellico.tips
+share/kde/apps/tellico/tellico2html.js
+share/kde/apps/tellico/tellico2html.xsl
+share/kde/apps/tellico/tellico2onix.xsl
+share/kde/apps/tellico/tellicoui.rc
+share/kde/apps/tellico/vhs-logo.png
+share/kde/apps/tellico/welcome.html
+share/kde/apps/tellico/xmp2tellico.xsl
+share/kde/apps/tellico/yahoo2tellico.xsl
+share/kde/apps/tellico/z3950-servers.cfg
+share/kde/config.kcfg/tellico_config.kcfg
+share/kde/config/tellico-script.knsrc
+share/kde/config/tellico-template.knsrc
+share/kde/config/tellicorc
+share/kde/mimelnk/application/x-tellico.desktop
+share/locale/bg/LC_MESSAGES/tellico.mo
+share/locale/ca/LC_MESSAGES/tellico.mo
+share/locale/cs/LC_MESSAGES/tellico.mo
+share/locale/da/LC_MESSAGES/tellico.mo
+share/locale/de/LC_MESSAGES/tellico.mo
+share/locale/el/LC_MESSAGES/tellico.mo
+share/locale/en_GB/LC_MESSAGES/tellico.mo
+share/locale/es/LC_MESSAGES/tellico.mo
+share/locale/et/LC_MESSAGES/tellico.mo
+share/locale/fi/LC_MESSAGES/tellico.mo
+share/locale/fr/LC_MESSAGES/tellico.mo
+share/locale/ga/LC_MESSAGES/tellico.mo
+share/locale/gl/LC_MESSAGES/tellico.mo
+share/locale/hu/LC_MESSAGES/tellico.mo
+share/locale/it/LC_MESSAGES/tellico.mo
+share/locale/lt/LC_MESSAGES/tellico.mo
+share/locale/ms/LC_MESSAGES/tellico.mo
+share/locale/nb/LC_MESSAGES/tellico.mo
+share/locale/nds/LC_MESSAGES/tellico.mo
+share/locale/nl/LC_MESSAGES/tellico.mo
+share/locale/nn/LC_MESSAGES/tellico.mo
+share/locale/pl/LC_MESSAGES/tellico.mo
+share/locale/pt/LC_MESSAGES/tellico.mo
+share/locale/pt_BR/LC_MESSAGES/tellico.mo
+share/locale/ro/LC_MESSAGES/tellico.mo
+share/locale/ru/LC_MESSAGES/tellico.mo
+share/locale/sk/LC_MESSAGES/tellico.mo
+share/locale/sv/LC_MESSAGES/tellico.mo
+share/locale/tr/LC_MESSAGES/tellico.mo
+share/locale/uk/LC_MESSAGES/tellico.mo
+share/locale/zh_CN/LC_MESSAGES/tellico.mo
+share/locale/zh_TW/LC_MESSAGES/tellico.mo
+share/mime/packages/tellico.xml
diff --git a/wip/tellico/distinfo b/wip/tellico/distinfo
new file mode 100644 (file)
index 0000000..b808871
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (tellico-2.0.tar.bz2) = af60c25e652d894716022aeec8a3b05da056cbb9
+RMD160 (tellico-2.0.tar.bz2) = 3eb38ab4df930e939937078a63581054c748e2da
+Size (tellico-2.0.tar.bz2) = 2462988 bytes
index 4a6e814..7a90d1b 100644 (file)
@@ -1,15 +1,15 @@
 # $NetBSD$
 #
 
-DISTNAME=      vdesk-1.2
-CATEGORIES=    wm x11
-MASTER_SITES=  http://offog.org/files/
+DISTNAME=              vdesk-1.2
+CATEGORIES=            wm x11
+MASTER_SITES=          http://offog.org/files/
 
-MAINTAINER=    bartosz.kuzma@gmail.com
-HOMEPAGE=      http://offog.org/code/vdesk.html
-COMMENT=       Virtual desktop manager
+MAINTAINER=            bartosz.kuzma@gmail.com
+HOMEPAGE=              http://offog.org/code/vdesk.html
+COMMENT=               Virtual desktop manager
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
index 9f18c88..67ac644 100644 (file)
@@ -3,4 +3,4 @@ bin/vdesk
 share/doc/vdesk/AUTHORS
 share/doc/vdesk/COPYING
 share/doc/vdesk/README
-@dirrm share/doc/vdesk
+@pkgdir share/doc/vdesk
index ef18795..839919f 100644 (file)
@@ -1,17 +1,20 @@
 # $NetBSD$
 #
 
-DISTNAME=      wbox-4
-CATEGORIES=    wip www
-MASTER_SITES=  http://www.hping.org/wbox/
+DISTNAME=              wbox-4
+CATEGORIES=            wip www
+MASTER_SITES=          http://www.hping.org/wbox/
 
-MAINTAINER=    bartosz.kuzma@gmail.com
-HOMEPAGE=      http://www.hping.org/wbox/
-COMMENT=       HTTP testing tool
+MAINTAINER=            bartosz.kuzma@gmail.com
+HOMEPAGE=              http://www.hping.org/wbox/
+COMMENT=               HTTP testing tool
+LICENSE=               gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/wbox
+PKG_DESTDIR_SUPPORT=    user-destdir
+
+WRKSRC=                        ${WRKDIR}/wbox
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/wbox ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/wbox ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"