diff options
| author | tnn <tnn> | 2009-10-21 16:51:46 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2009-10-21 16:51:46 +0000 |
| commit | 7512e949eaa9199c6d2d1e9e5165e00068fca508 (patch) | |
| tree | f030fcd39f7dd2b9d5cfe42e3c169420a25ddef3 /editors | |
| parent | c63b1fc7f4191910aab8a7f99c17fd5f4b6baf94 (diff) | |
| download | pkgsrc-7512e949eaa9199c6d2d1e9e5165e00068fca508.tar.gz | |
resolve lib/charset.alias conflicts. PR pkg/42199
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/zile/Makefile | 5 | ||||
| -rw-r--r-- | editors/zile/PLIST | 3 | ||||
| -rw-r--r-- | editors/zile/distinfo | 3 | ||||
| -rw-r--r-- | editors/zile/patches/patch-aa | 12 |
4 files changed, 19 insertions, 4 deletions
diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 6311775690c..7acc6ccd858 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2009/07/19 11:49:10 zafer Exp $ +# $NetBSD: Makefile,v 1.25 2009/10/21 16:51:46 tnn Exp $ DISTNAME= zile-2.3.9 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= http://ftp.gnu.org/gnu/zile/ @@ -17,6 +18,8 @@ GNU_CONFIGURE= yes INFO_FILES= # PLIST +# we only want the charset.alias file, so no buildlinkery for libiconv +DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/zile/PLIST b/editors/zile/PLIST index 04949d7a1cd..17b32df9dcf 100644 --- a/editors/zile/PLIST +++ b/editors/zile/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2009/07/19 11:49:10 zafer Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/10/21 16:51:46 tnn Exp $ bin/zile -lib/charset.alias man/man1/zile.1 share/zile/FAQ share/zile/dotzile.sample diff --git a/editors/zile/distinfo b/editors/zile/distinfo index 3ffd6f563c4..478b23b6c8d 100644 --- a/editors/zile/distinfo +++ b/editors/zile/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2009/07/19 11:49:10 zafer Exp $ +$NetBSD: distinfo,v 1.9 2009/10/21 16:51:46 tnn Exp $ SHA1 (zile-2.3.9.tar.gz) = e3d90bcdfd40ce8ad31e2154fe78a9abf679796b RMD160 (zile-2.3.9.tar.gz) = 2d15bc0cd7d58fe75779f9adf5152de646dd7373 Size (zile-2.3.9.tar.gz) = 706848 bytes +SHA1 (patch-aa) = 7a955b340c77b4c539b3d5ea7880c06d777dc424 diff --git a/editors/zile/patches/patch-aa b/editors/zile/patches/patch-aa new file mode 100644 index 00000000000..7d96680fc57 --- /dev/null +++ b/editors/zile/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.5 2009/10/21 16:51:46 tnn Exp $ + +--- lib/Makefile.in.orig 2009-07-08 16:10:42.000000000 +0200 ++++ lib/Makefile.in +@@ -1221,6 +1221,7 @@ install-exec-local: all-local + else \ + need_charset_alias=false ; \ + fi ; \ ++ need_charset_alias=false`# provided by pkgsrc/converters/libiconv`; \ + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ |