summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authormishka <mishka@pkgsrc.org>2012-07-24 17:17:30 +0000
committermishka <mishka@pkgsrc.org>2012-07-24 17:17:30 +0000
commit398e5a6f43a1bf11a0ab27b51640449e99ee6bb2 (patch)
tree0bbf3b3279ef8fc2bd4269117461b66eb92b470c /converters
parent8ec54294920e2d2b09b23298cc786c677de1588c (diff)
downloadpkgsrc-398e5a6f43a1bf11a0ab27b51640449e99ee6bb2.tar.gz
Update d1489 to version 1.5.1. Changes unknown. The package changes:
- restore master sites and homepage - specify distribution license
Diffstat (limited to 'converters')
-rw-r--r--converters/ru-d1489/Makefile12
-rw-r--r--converters/ru-d1489/distinfo12
-rw-r--r--converters/ru-d1489/patches/patch-aa38
-rw-r--r--converters/ru-d1489/patches/patch-ab49
4 files changed, 73 insertions, 38 deletions
diff --git a/converters/ru-d1489/Makefile b/converters/ru-d1489/Makefile
index 43172e12202..ecaf3ddc1a0 100644
--- a/converters/ru-d1489/Makefile
+++ b/converters/ru-d1489/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2011/03/11 10:48:08 zafer Exp $
+# $NetBSD: Makefile,v 1.5 2012/07/24 17:17:30 mishka Exp $
-DISTNAME= d1489-1.4
-PKGNAME= ru-d1489-1.4
+DISTNAME= d1489-1.5.1
+PKGNAME= ru-${DISTNAME}
CATEGORIES= converters
-MASTER_SITES= # ftp://ftp.kiarchive.ru/pub/unix/convert/char/
+MASTER_SITES= http://koi8.pp.ru/dist/
EXTRACT_SUFX= .tgz
MAINTAINER= mishka@NetBSD.org
-#HOMEPAGE=
+HOMEPAGE= http://koi8.pp.ru/unix.html
COMMENT= CP866<->KOI8-R, CP1251<->KOI8-R and font converters acc. to RFC1489
+LICENSE= 2-clause-bsd
+
INSTALLATION_DIRS+= bin
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/converters/ru-d1489/distinfo b/converters/ru-d1489/distinfo
index bef35c6ee69..9509b508bd2 100644
--- a/converters/ru-d1489/distinfo
+++ b/converters/ru-d1489/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2010/01/29 16:51:38 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/07/24 17:17:30 mishka Exp $
-SHA1 (d1489-1.4.tgz) = 648dc8f7af860237d09d55784bb869bd80584910
-RMD160 (d1489-1.4.tgz) = 1d66b92a4cb03e4256230f2597784e520185e6be
-Size (d1489-1.4.tgz) = 9588 bytes
-SHA1 (patch-aa) = 554cd0e768142e45e702828cd02f4cd01cb1b1e6
-SHA1 (patch-ab) = 836a527343fc5c02e66d4fa82ca75a171b879784
+SHA1 (d1489-1.5.1.tgz) = 98634ac2b80c7692021e0798b5ea1974490f9d02
+RMD160 (d1489-1.5.1.tgz) = 040efe1b3d1c0040cac72b6b85e6a069e8828835
+Size (d1489-1.5.1.tgz) = 9862 bytes
+SHA1 (patch-aa) = 4d8876ee371972b6ca0133aa1c29a1638e21fcf0
+SHA1 (patch-ab) = 8d89e52b8ad331f8cc1f16c1e9477cee115eb7ad
diff --git a/converters/ru-d1489/patches/patch-aa b/converters/ru-d1489/patches/patch-aa
index b262a0a7953..33b9bf471af 100644
--- a/converters/ru-d1489/patches/patch-aa
+++ b/converters/ru-d1489/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
+$NetBSD: patch-aa,v 1.2 2012/07/24 17:17:30 mishka Exp $
---- todos.c Tue Dec 22 01:50:00 1998
-+++ todos.nb.c Sun Jun 23 17:02:54 2002
-@@ -97,6 +97,7 @@
+Make C compiler happy. N.B.: should be submitted to ache@.
+
+--- todos.c.orig 2003-01-02 20:17:18.000000000 +0000
++++ todos.c
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <utime.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #if defined(__MSDOS__) || defined(__OS2__)
+@@ -98,6 +99,7 @@ char *outdir = "";
main(int ac, char **av)
{
char *name, *tmpn, *srcn, *s, *incode, *outcode;
@@ -10,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
FILE *fin, *fout;
struct stat statb;
int got_stat = FALSE;
-@@ -251,10 +252,11 @@
+@@ -258,10 +260,11 @@ usage:
}
sprintf(tmp_name, "%s%s%s", outdir, *outdir ? "/" : "", tmp_pat);
@@ -23,7 +33,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
while (ac-- > 1) {
srcn = av[1];
-@@ -267,7 +269,7 @@
+@@ -274,7 +277,7 @@ usage:
perror(srcn);
goto usage;
}
@@ -32,3 +42,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
perror(tmpn);
return 1;
}
+@@ -302,11 +305,11 @@ usage:
+ return 1;
+ }
+ if (got_stat) {
+- long ut[2];
++ struct utimbuf ut;
+
+- ut[0] = statb.st_atime;
+- ut[1] = statb.st_mtime;
+- utime(srcn, ut);
++ ut.actime = statb.st_atime;
++ ut.modtime = statb.st_mtime;
++ utime(srcn, &ut);
+ }
+ if (verbose)
+ fprintf(stderr, "Done.\n");
diff --git a/converters/ru-d1489/patches/patch-ab b/converters/ru-d1489/patches/patch-ab
index 55482b62acc..08791699920 100644
--- a/converters/ru-d1489/patches/patch-ab
+++ b/converters/ru-d1489/patches/patch-ab
@@ -1,27 +1,34 @@
-$NetBSD: patch-ab,v 1.2 2010/01/29 16:51:38 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2012/07/24 17:17:30 mishka Exp $
---- Makefile.orig Wed Nov 5 01:25:46 1997
-+++ Makefile Fri Jul 12 21:48:50 2002
-@@ -36,14 +36,14 @@
- $(CC) $(CFLAGS) $(LDFLAGS) a2kfcnv.c -o $@
+Adopt to pkgsrc framework.
+
+--- Makefile.orig 2005-10-16 22:08:22.000000000 +0000
++++ Makefile
+@@ -23,7 +23,7 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+
+-PREFIX=/usr/local
++PREFIX?=/usr/local
+ LOCAL_CFLAGS=-O
+ #LOCAL_CFLAGS=-O -DNO_RENAME
+ LOCAL_LDFLAGS=-s
+@@ -39,12 +39,12 @@ a2kfcnv: a2kfcnv.c koi82alt.h
+ a2kfcnv.c -o $@
install: todos a2kfcnv
-- cp todos /usr/local/bin
-- -rm /usr/local/bin/fromdos
-- -rm /usr/local/bin/fromwin
-- -rm /usr/local/bin/towin
-- ln /usr/local/bin/todos /usr/local/bin/fromdos
-- ln /usr/local/bin/todos /usr/local/bin/fromwin
-- ln /usr/local/bin/todos /usr/local/bin/towin
-- cp a2kfcnv /usr/local/bin
-+ ${BSD_INSTALL_PROGRAM} todos ${DESTDIR}$(PREFIX)/bin
-+ -rm -f $(PREFIX)/bin/fromdos
-+ -rm -f $(PREFIX)/bin/fromwin
-+ -rm -f $(PREFIX)/bin/towin
-+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromdos
-+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromwin
-+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/towin
-+ ${BSD_INSTALL_PROGRAM} a2kfcnv ${DESTDIR}$(PREFIX)/bin
+- cp todos ${PREFIX}/bin
+- -rm -f ${PREFIX}/bin/fromdos ${PREFIX}/bin/fromwin ${PREFIX}/bin/towin
+- ln ${PREFIX}/bin/todos ${PREFIX}/bin/fromdos
+- ln ${PREFIX}/bin/todos ${PREFIX}/bin/fromwin
+- ln ${PREFIX}/bin/todos ${PREFIX}/bin/towin
+- cp a2kfcnv ${PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} todos ${DESTDIR}${PREFIX}/bin
++ -rm -f ${DESTDIR}${PREFIX}/bin/fromdos ${DESTDIR}${PREFIX}/bin/fromwin ${DESTDIR}${PREFIX}/bin/towin
++ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/fromdos
++ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/fromwin
++ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/towin
++ ${BSD_INSTALL_PROGRAM} a2kfcnv ${DESTDIR}${PREFIX}/bin
clean:
-rm -f todos a2kfcnv