From f268feef5acc5f46f31194e220774a4fca02bba7 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Thu, 6 Jan 2011 13:35:35 -0800 Subject: [PATCH] Fixup fromcvs/togit conversion --- devel/subversion/Makefile.common | 4 ++-- filesystems/u9fs/distinfo | 4 ++-- filesystems/u9fs/patches/patch-ab | 4 ++-- net/dhcpcd/patches/patch-aa | 35 ------------------------------- net/dhcpcd/patches/patch-ab | 14 ------------- print/ted/files/README.ind | 1 - print/ted/files/md5 | 3 --- print/ted/patches/patch-aa | 12 ----------- print/ted/pkg/COMMENT | 1 - print/ted/pkg/DESCR | 24 --------------------- print/ted/pkg/MESSAGE | 7 ------- print/ted/pkg/PLIST | 22 ------------------- 12 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 net/dhcpcd/patches/patch-aa delete mode 100644 net/dhcpcd/patches/patch-ab delete mode 100644 print/ted/files/README.ind delete mode 100644 print/ted/files/md5 delete mode 100644 print/ted/patches/patch-aa delete mode 100644 print/ted/pkg/COMMENT delete mode 100644 print/ted/pkg/DESCR delete mode 100644 print/ted/pkg/MESSAGE delete mode 100644 print/ted/pkg/PLIST diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 4148a0b177d..03d2e333161 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2010/03/03 16:33:08 gdt Exp $ +# $NetBSD: Makefile.common,v 1.35 2010/06/30 15:07:10 gdt Exp $ # used by devel/java-subversion/Makefile # used by devel/p5-subversion/Makefile # used by devel/py-subversion/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel scm MASTER_SITES= http://subversion.tigris.org/downloads/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://subversion.tigris.org/ +HOMEPAGE= http://subversion.apache.org/ LICENSE= apache-1.1 # gdt isn't set up to test ruby/python/perl and java bindings, and diff --git a/filesystems/u9fs/distinfo b/filesystems/u9fs/distinfo index 40fba969d96..8edd5b968f1 100644 --- a/filesystems/u9fs/distinfo +++ b/filesystems/u9fs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2007/05/13 15:34:05 agc Exp $ +$NetBSD: distinfo,v 1.3 2009/07/08 16:44:49 joerg Exp $ SHA1 (u9fs-2.0.3.tar.gz) = 98b6d1b26a516761ee392d2c3ed15528af84601b RMD160 (u9fs-2.0.3.tar.gz) = 460879d27c4d282a3b4822c194b2abf458851b4d Size (u9fs-2.0.3.tar.gz) = 42325 bytes SHA1 (patch-aa) = 2a8f531d85187737b779fe6e339def22ae3c76e5 -SHA1 (patch-ab) = 0cd3d25449ddce2657a24ea3de531adaac477df0 +SHA1 (patch-ab) = c5fe5cdc5fccca3085f6c6542496623d43928bfe SHA1 (patch-ac) = 7251853f1dc6cecaaf67c617e5dfb74ecae12b19 SHA1 (patch-ad) = d7a26f4db9eb543ee47dc621b7a79be11d4f42cd SHA1 (patch-ae) = 8fd3ddbe26275361878c5820f46092005f36f887 diff --git a/filesystems/u9fs/patches/patch-ab b/filesystems/u9fs/patches/patch-ab index 77ea4ff1183..fad8c32b0dc 100644 --- a/filesystems/u9fs/patches/patch-ab +++ b/filesystems/u9fs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: patch-ab,v 1.1.1.1 2007/04/24 19:06:03 agc Exp $ --- u9fs.c 2007/04/23 22:01:05 1.1 +++ u9fs.c 2007/04/23 22:29:28 @@ -8,7 +8,7 @@ $NetBSD$ +#if __linux__ #include -+#elif __NetBSD__ ++#elif defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) +#include +#define MAJOR(m) major(m) +#define MINOR(m) minor(m) diff --git a/net/dhcpcd/patches/patch-aa b/net/dhcpcd/patches/patch-aa deleted file mode 100644 index 2103776fe83..00000000000 --- a/net/dhcpcd/patches/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD$ - ---- if-bsd.c.orig 2010-12-05 21:31:47.000000000 +0000 -+++ if-bsd.c -@@ -37,10 +37,12 @@ - #include - #include - #include --#ifdef __DragonFly__ -+#ifndef __APPLE__ -+# ifdef __DragonFly__ - # include --#else -+# else - # include -+# endif - #endif - - #include -@@ -342,6 +344,7 @@ manage_link(int fd) - for (p = link_buf; p < e; p += rtm->rtm_msglen) { - rtm = (struct rt_msghdr *)(void *)p; - switch(rtm->rtm_type) { -+#ifdef RTM_IFANNOUNCE - case RTM_IFANNOUNCE: - ifan = (struct if_announcemsghdr *)(void *)p; - switch(ifan->ifan_what) { -@@ -353,6 +356,7 @@ manage_link(int fd) - break; - } - break; -+#endif - case RTM_IFINFO: - ifm = (struct if_msghdr *)(void *)p; - memset(ifname, 0, sizeof(ifname)); diff --git a/net/dhcpcd/patches/patch-ab b/net/dhcpcd/patches/patch-ab deleted file mode 100644 index fdba7fa8ca3..00000000000 --- a/net/dhcpcd/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - ---- platform-bsd.c.orig 2010-12-05 22:00:27.000000000 +0000 -+++ platform-bsd.c -@@ -31,6 +31,9 @@ - - #include "platform.h" - -+#ifdef __APPLE__ -+# define SYS_NMLN 256 -+#endif - static char march[SYS_NMLN]; - - char * diff --git a/print/ted/files/README.ind b/print/ted/files/README.ind deleted file mode 100644 index 487c7a51366..00000000000 --- a/print/ted/files/README.ind +++ /dev/null @@ -1 +0,0 @@ -This directory contains the installed spelling dictionaries for Ted. diff --git a/print/ted/files/md5 b/print/ted/files/md5 deleted file mode 100644 index e1da6de56df..00000000000 --- a/print/ted/files/md5 +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD$ - -MD5 (ted-2.5.src.tar.gz) = 6b53d433ebb46cede951617105e3a093 diff --git a/print/ted/patches/patch-aa b/print/ted/patches/patch-aa deleted file mode 100644 index c2e8a31099e..00000000000 --- a/print/ted/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD$ - ---- Ted/makefile.in.orig Fri Jul 23 06:52:42 1999 -+++ Ted/makefile.in Mon Aug 30 08:48:21 1999 -@@ -12,5 +12,6 @@ - -I../appUtil \ - -I../include \ -- $(DEF_PKGDIR) -+ $(DEF_PKGDIR) \ -+ $(DEF_INFODIR) - - LDFLAGS=@LDFLAGS@ diff --git a/print/ted/pkg/COMMENT b/print/ted/pkg/COMMENT deleted file mode 100644 index 0e7d2cc757d..00000000000 --- a/print/ted/pkg/COMMENT +++ /dev/null @@ -1 +0,0 @@ -X11 based WordPad-like word processor. diff --git a/print/ted/pkg/DESCR b/print/ted/pkg/DESCR deleted file mode 100644 index d8426b3da75..00000000000 --- a/print/ted/pkg/DESCR +++ /dev/null @@ -1,24 +0,0 @@ -Ted is a text editor running under X Windows on Unix/Linux systems. Ted was -developed as an operating system accessory like Wordpad on MS-Windows. -Teds function is to be able to edit rich text documents on Unix/Linux in a -wysiwyg way. - -Features --------- - * Wysiwyg rich text editing. - * Ted uses Microsoft RTF as its native file format. - * In line bitmap pictures. - * Postscript printing. - * Spelling checking in several Latin languages. (English, Dutch, German, - Portuguese, French and Spanish.) - * Directly mailing documents from Ted. - * Cut/Copy/Paste, also with other applications. - * Find/Replace. - * Ruler: Paragraph indentation, Indentation of first line, Tabs. Copy/Paste - Ruler. - * Page breaks. - * Tables: Insert Table, Row, Column. Changing the column width of tables - with their ruler. - * Symbols and accented characters are fully supported. - * Hyperlinks. - * Saving a document in HTML format. diff --git a/print/ted/pkg/MESSAGE b/print/ted/pkg/MESSAGE deleted file mode 100644 index 6f6a6536f50..00000000000 --- a/print/ted/pkg/MESSAGE +++ /dev/null @@ -1,7 +0,0 @@ -============================================================================= -$NetBSD$ - -This pkg does not install any spelling dictionaries. Spelling dictionaries -for various languages are available as separate packages. - -============================================================================= diff --git a/print/ted/pkg/PLIST b/print/ted/pkg/PLIST deleted file mode 100644 index bdeef0149e8..00000000000 --- a/print/ted/pkg/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD$ -bin/Ted -share/Ted/afm/Courier-Bold.afm -share/Ted/afm/Courier-BoldOblique.afm -share/Ted/afm/Courier-Oblique.afm -share/Ted/afm/Courier.afm -share/Ted/afm/Helvetica-Bold.afm -share/Ted/afm/Helvetica-BoldOblique.afm -share/Ted/afm/Helvetica-Oblique.afm -share/Ted/afm/Helvetica.afm -share/Ted/afm/Symbol.afm -share/Ted/afm/Times-Bold.afm -share/Ted/afm/Times-BoldItalic.afm -share/Ted/afm/Times-Italic.afm -share/Ted/afm/Times-Roman.afm -lib/X11/app-defaults/Ted -share/doc/Ted/TedDocument.rtf -share/Ted/ind/README.ind -@dirrm share/Ted/afm -@dirrm share/Ted/ind -@dirrm share/Ted -@dirrm share/doc/Ted -- 2.41.0