Tue Jul 24 17:17:30 2012 UTC ()
Update d1489 to version 1.5.1. Changes unknown. The package changes:
- restore master sites and homepage
- specify distribution license


(mishka)
diff -r1.4 -r1.5 pkgsrc/converters/ru-d1489/Makefile
diff -r1.3 -r1.4 pkgsrc/converters/ru-d1489/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/converters/ru-d1489/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/converters/ru-d1489/patches/patch-ab
cvs diff -r1.4 -r1.5 pkgsrc/converters/ru-d1489/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/ru-d1489/Makefile 2011/03/11 10:48:08 1.4
+++ pkgsrc/converters/ru-d1489/Makefile 2012/07/24 17:17:30 1.5
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2011/03/11 10:48:08 zafer Exp $ 1# $NetBSD: Makefile,v 1.5 2012/07/24 17:17:30 mishka Exp $
2 2
3DISTNAME= d1489-1.4 3DISTNAME= d1489-1.5.1
4PKGNAME= ru-d1489-1.4 4PKGNAME= ru-${DISTNAME}
5CATEGORIES= converters 5CATEGORIES= converters
6MASTER_SITES= # ftp://ftp.kiarchive.ru/pub/unix/convert/char/ 6MASTER_SITES= http://koi8.pp.ru/dist/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= mishka@NetBSD.org 9MAINTAINER= mishka@NetBSD.org
10#HOMEPAGE= 10HOMEPAGE= http://koi8.pp.ru/unix.html
11COMMENT= CP866<->KOI8-R, CP1251<->KOI8-R and font converters acc. to RFC1489 11COMMENT= CP866<->KOI8-R, CP1251<->KOI8-R and font converters acc. to RFC1489
12 12
 13LICENSE= 2-clause-bsd
 14
13INSTALLATION_DIRS+= bin 15INSTALLATION_DIRS+= bin
14PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
15 17
16.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/converters/ru-d1489/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/ru-d1489/distinfo 2010/01/29 16:51:38 1.3
+++ pkgsrc/converters/ru-d1489/distinfo 2012/07/24 17:17:30 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2010/01/29 16:51:38 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2012/07/24 17:17:30 mishka Exp $
2 2
3SHA1 (d1489-1.4.tgz) = 648dc8f7af860237d09d55784bb869bd80584910 3SHA1 (d1489-1.5.1.tgz) = 98634ac2b80c7692021e0798b5ea1974490f9d02
4RMD160 (d1489-1.4.tgz) = 1d66b92a4cb03e4256230f2597784e520185e6be 4RMD160 (d1489-1.5.1.tgz) = 040efe1b3d1c0040cac72b6b85e6a069e8828835
5Size (d1489-1.4.tgz) = 9588 bytes 5Size (d1489-1.5.1.tgz) = 9862 bytes
6SHA1 (patch-aa) = 554cd0e768142e45e702828cd02f4cd01cb1b1e6 6SHA1 (patch-aa) = 4d8876ee371972b6ca0133aa1c29a1638e21fcf0
7SHA1 (patch-ab) = 836a527343fc5c02e66d4fa82ca75a171b879784 7SHA1 (patch-ab) = 8d89e52b8ad331f8cc1f16c1e9477cee115eb7ad
cvs diff -r1.1.1.1 -r1.2 pkgsrc/converters/ru-d1489/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/converters/ru-d1489/patches/patch-aa 2002/07/12 21:01:17 1.1.1.1
+++ pkgsrc/converters/ru-d1489/patches/patch-aa 2012/07/24 17:17:30 1.2
@@ -1,34 +1,60 @@ @@ -1,34 +1,60 @@
1$NetBSD: patch-aa,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $ 1$NetBSD: patch-aa,v 1.2 2012/07/24 17:17:30 mishka Exp $
2 2
3--- todos.c Tue Dec 22 01:50:00 1998 3Make C compiler happy. N.B.: should be submitted to ache@.
4+++ todos.nb.c Sun Jun 23 17:02:54 2002 4
5@@ -97,6 +97,7 @@ 5--- todos.c.orig 2003-01-02 20:17:18.000000000 +0000
 6+++ todos.c
 7@@ -33,6 +33,7 @@
 8 #include <stdio.h>
 9 #include <string.h>
 10 #include <ctype.h>
 11+#include <utime.h>
 12 #include <sys/types.h>
 13 #include <sys/stat.h>
 14 #if defined(__MSDOS__) || defined(__OS2__)
 15@@ -98,6 +99,7 @@ char *outdir = "";
6 main(int ac, char **av) 16 main(int ac, char **av)
7 { 17 {
8 char *name, *tmpn, *srcn, *s, *incode, *outcode; 18 char *name, *tmpn, *srcn, *s, *incode, *outcode;
9+ int tmpfd; 19+ int tmpfd;
10 FILE *fin, *fout; 20 FILE *fin, *fout;
11 struct stat statb; 21 struct stat statb;
12 int got_stat = FALSE; 22 int got_stat = FALSE;
13@@ -251,10 +252,11 @@ 23@@ -258,10 +260,11 @@ usage:
14 } 24 }
15  25
16 sprintf(tmp_name, "%s%s%s", outdir, *outdir ? "/" : "", tmp_pat); 26 sprintf(tmp_name, "%s%s%s", outdir, *outdir ? "/" : "", tmp_pat);
17- if ((tmpn = mktemp(tmp_name)) == NULL) { 27- if ((tmpn = mktemp(tmp_name)) == NULL) {
18+ if ((tmpfd = mkstemp(tmp_name)) < 0) { 28+ if ((tmpfd = mkstemp(tmp_name)) < 0) {
19 perror(tmp_name); 29 perror(tmp_name);
20 return 1; 30 return 1;
21 } 31 }
22+ strcpy(tmpn, tmp_name); 32+ strcpy(tmpn, tmp_name);
23  33
24 while (ac-- > 1) { 34 while (ac-- > 1) {
25 srcn = av[1]; 35 srcn = av[1];
26@@ -267,7 +269,7 @@ 36@@ -274,7 +277,7 @@ usage:
27 perror(srcn); 37 perror(srcn);
28 goto usage; 38 goto usage;
29 } 39 }
30- if ((fout = fopen(tmpn, WB)) == NULL) { 40- if ((fout = fopen(tmpn, WB)) == NULL) {
31+ if ((fout = fdopen(tmpfd, WB)) == NULL) { 41+ if ((fout = fdopen(tmpfd, WB)) == NULL) {
32 perror(tmpn); 42 perror(tmpn);
33 return 1; 43 return 1;
34 } 44 }
 45@@ -302,11 +305,11 @@ usage:
 46 return 1;
 47 }
 48 if (got_stat) {
 49- long ut[2];
 50+ struct utimbuf ut;
 51
 52- ut[0] = statb.st_atime;
 53- ut[1] = statb.st_mtime;
 54- utime(srcn, ut);
 55+ ut.actime = statb.st_atime;
 56+ ut.modtime = statb.st_mtime;
 57+ utime(srcn, &ut);
 58 }
 59 if (verbose)
 60 fprintf(stderr, "Done.\n");
cvs diff -r1.2 -r1.3 pkgsrc/converters/ru-d1489/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/converters/ru-d1489/patches/patch-ab 2010/01/29 16:51:38 1.2
+++ pkgsrc/converters/ru-d1489/patches/patch-ab 2012/07/24 17:17:30 1.3
@@ -1,27 +1,34 @@ @@ -1,27 +1,34 @@
1$NetBSD: patch-ab,v 1.2 2010/01/29 16:51:38 joerg Exp $ 1$NetBSD: patch-ab,v 1.3 2012/07/24 17:17:30 mishka Exp $
2 2
3--- Makefile.orig Wed Nov 5 01:25:46 1997 3Adopt to pkgsrc framework.
4+++ Makefile Fri Jul 12 21:48:50 2002 4
5@@ -36,14 +36,14 @@ 5--- Makefile.orig 2005-10-16 22:08:22.000000000 +0000
6 $(CC) $(CFLAGS) $(LDFLAGS) a2kfcnv.c -o $@ 6+++ Makefile
 7@@ -23,7 +23,7 @@
 8 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 9 # SUCH DAMAGE.
 10
 11-PREFIX=/usr/local
 12+PREFIX?=/usr/local
 13 LOCAL_CFLAGS=-O
 14 #LOCAL_CFLAGS=-O -DNO_RENAME
 15 LOCAL_LDFLAGS=-s
 16@@ -39,12 +39,12 @@ a2kfcnv: a2kfcnv.c koi82alt.h
 17 a2kfcnv.c -o $@
7  18
8 install: todos a2kfcnv 19 install: todos a2kfcnv
9- cp todos /usr/local/bin 20- cp todos ${PREFIX}/bin
10- -rm /usr/local/bin/fromdos 21- -rm -f ${PREFIX}/bin/fromdos ${PREFIX}/bin/fromwin ${PREFIX}/bin/towin
11- -rm /usr/local/bin/fromwin 22- ln ${PREFIX}/bin/todos ${PREFIX}/bin/fromdos
12- -rm /usr/local/bin/towin 23- ln ${PREFIX}/bin/todos ${PREFIX}/bin/fromwin
13- ln /usr/local/bin/todos /usr/local/bin/fromdos 24- ln ${PREFIX}/bin/todos ${PREFIX}/bin/towin
14- ln /usr/local/bin/todos /usr/local/bin/fromwin 25- cp a2kfcnv ${PREFIX}/bin
15- ln /usr/local/bin/todos /usr/local/bin/towin 26+ ${BSD_INSTALL_PROGRAM} todos ${DESTDIR}${PREFIX}/bin
16- cp a2kfcnv /usr/local/bin 27+ -rm -f ${DESTDIR}${PREFIX}/bin/fromdos ${DESTDIR}${PREFIX}/bin/fromwin ${DESTDIR}${PREFIX}/bin/towin
17+ ${BSD_INSTALL_PROGRAM} todos ${DESTDIR}$(PREFIX)/bin 28+ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/fromdos
18+ -rm -f $(PREFIX)/bin/fromdos 29+ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/fromwin
19+ -rm -f $(PREFIX)/bin/fromwin 30+ ln ${DESTDIR}${PREFIX}/bin/todos ${DESTDIR}${PREFIX}/bin/towin
20+ -rm -f $(PREFIX)/bin/towin 31+ ${BSD_INSTALL_PROGRAM} a2kfcnv ${DESTDIR}${PREFIX}/bin
21+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromdos 
22+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromwin 
23+ ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/towin 
24+ ${BSD_INSTALL_PROGRAM} a2kfcnv ${DESTDIR}$(PREFIX)/bin 
25  32
26 clean: 33 clean:
27 -rm -f todos a2kfcnv 34 -rm -f todos a2kfcnv