diff --git a/vietnamese/vnpstext/Makefile b/vietnamese/vnpstext/Makefile index 4e9bcf5fdc9a..132a1ce0c5c3 100644 --- a/vietnamese/vnpstext/Makefile +++ b/vietnamese/vnpstext/Makefile @@ -1,20 +1,23 @@ PORTNAME= vnpstext PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= vietnamese print MASTER_SITES= ftp://ftp.monash.edu.au/pub/vietnam/unix/ DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Converts 8-bit VISCII Vietnamese text into PostScript +LICENSE= NONE + CFLAGS+= -I../../include do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/vn-fonts ${INSTALL_PROGRAM} ${WRKSRC}/vnpstext ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC} ; \ ${INSTALL_DATA} *.ps prologs/*.pro ${STAGEDIR}${PREFIX}/share/vn-fonts) ${INSTALL_MAN} ${WRKSRC}/vnpstext.1V ${STAGEDIR}${PREFIX}/man/man1/vnpstext.1 .include diff --git a/vietnamese/vnpstext/files/patch-Makefile b/vietnamese/vnpstext/files/patch-Makefile index 0795e9e4bc8d..ca0e1404c728 100644 --- a/vietnamese/vnpstext/files/patch-Makefile +++ b/vietnamese/vnpstext/files/patch-Makefile @@ -1,12 +1,12 @@ ---- Makefile.orig Thu May 14 21:59:59 1992 -+++ Makefile Sat Dec 7 23:15:47 1996 +--- Makefile.orig 1992-05-15 04:59:59 UTC ++++ Makefile @@ -4,7 +4,8 @@ .SUFFIXES: .src .ps .pro -DEFAULT_PSLIBDIR = "\"/usr/local/lib/ps\"" +#DEFAULT_PSLIBDIR = "\"/usr/local/lib/ps\"" +DEFAULT_PSLIBDIR = "\"$(DESTDIR)$(PREFIX)/share/vn-fonts\"" SHELL = /bin/sh VNLIBDIR= ../lib diff --git a/vietnamese/vnpstext/files/patch-vnpstext.1V b/vietnamese/vnpstext/files/patch-vnpstext.1V index 6ac41ff2d8c0..928f208b5c63 100644 --- a/vietnamese/vnpstext/files/patch-vnpstext.1V +++ b/vietnamese/vnpstext/files/patch-vnpstext.1V @@ -1,20 +1,20 @@ ---- vnpstext.1V.orig Thu May 14 21:43:57 1992 -+++ vnpstext.1V Sun Dec 8 02:13:22 1996 -@@ -41,7 +41,7 @@ +--- vnpstext.1V.orig 1992-05-15 04:43:57 UTC ++++ vnpstext.1V +@@ -41,7 +41,7 @@ sizes in normal and bold faces, respectively. .PP The location of the prolog file can either be the current directory, or in -.I /usr/local/lib/ps. +.I /usr/local/share/vn-fonts. The latter setting may be overridden by the environment variable .I PSLIBDIR. -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ The line length is limited to 1024 characters. Lines are not wrapped. If a line is too long to fit across a page width, it is truncated (by the printer). .SH FILES -.IP \fI/usr/local/lib/ps:\fP 20m +.IP \fI/usr/local/share/vn-fonts:\fP 20m default prolog search directory .IP \fIinitcour.ps:\fP 20m Vietnamese Courier font file to download to the printer. diff --git a/vietnamese/vnpstext/files/patch-vnpstext.c b/vietnamese/vnpstext/files/patch-vnpstext.c index 52c6b9fa935a..59050de31ece 100644 --- a/vietnamese/vnpstext/files/patch-vnpstext.c +++ b/vietnamese/vnpstext/files/patch-vnpstext.c @@ -1,31 +1,31 @@ ---- ./vnpstext.c.orig 1992-09-02 23:01:59.000000000 +0200 -+++ ./vnpstext.c 2013-05-27 16:27:32.390245389 +0200 -@@ -86,7 +86,8 @@ +--- vnpstext.c.orig 1992-09-02 21:01:59 UTC ++++ vnpstext.c +@@ -86,7 +86,8 @@ main(ac, av) dofile(input) FILE *input; { - u_char line[1024]; +#define LINESIZE 1024 + u_char line[LINESIZE]; register u_char *s; register int pageno = 1; register short col = 0; -@@ -95,7 +96,8 @@ +@@ -95,7 +96,8 @@ dofile(input) printf("StartDoc\n"); - while (gets(line)) { + while (fgets(line, LINESIZE, stdin)) { + if (line[ strlen(line) - 1 ] == '\n') line[ strlen(line) - 1 ] = '\0'; if (!*line) printf("B\n"); else { -@@ -180,7 +182,7 @@ +@@ -180,7 +182,7 @@ doprolog(file) printf("/S{Lcheck count{gsave show grestore}repeat 0 ld rmoveto}def\n"); printf("/L{Lcheck ld mul 0 exch rmoveto}def\n"); printf("/B{Lcheck 0 ld rmoveto}def\n"); - return; -+ return NULL; ++ return 0; } /* filename specified, use it */