Index: head/korean/hpscat/Makefile =================================================================== --- head/korean/hpscat/Makefile (revision 546703) +++ head/korean/hpscat/Makefile (revision 546704) @@ -1,44 +1,40 @@ # Created by: Junho CHOI # $FreeBSD$ PORTNAME= hpscat PORTVERSION= 1.3.1 PORTEPOCH= 2 CATEGORIES= korean print MASTER_SITES= http://ftp.kaist.ac.kr/hangul/print/hpscat/ \ ftp://ftp.kaist.ac.kr/hangul/print/hpscat/ \ http://ftp.kaist.ac.kr/hangul/editor/ked/:ked \ ftp://ftp.kaist.ac.kr/hangul/editor/ked/:ked \ ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ PKGNAMESUFFIX= -jshin DISTNAME= ${PORTNAME}${PKGNAMESUFFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ked.tar.gz:ked MAINTAINER= ports@FreeBSD.org COMMENT= Hangul Text Printing Utility -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - RUN_DEPENDS= hcode:korean/hcode FONTDIR= ${PREFIX}/${FONTDIR_REL} FONTDIR_REL= share/fonts/ked-${PORTNAME} FONTFILES= Gotic Header Munjo MunjoBold PCMunjo README_FILES= README README.jshin README.jshin.ks PLIST_FILES= bin/hpscat bin/hpscat.bin .for i in ${FONTFILES} ${README_FILES} PLIST_FILES+= ${FONTDIR_REL}/${i} .endfor SUB_FILES= hpscat.sh pkg-message SUB_LIST= FONTDIR=${FONTDIR} USES= perl5 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/hpscat ${STAGEDIR}${PREFIX}/bin/hpscat.bin @${INSTALL_SCRIPT} ${WRKDIR}/hpscat.sh ${STAGEDIR}${PREFIX}/bin/hpscat @cd ${WRKSRC} && ${COPYTREE_SHARE} "${README_FILES}" ${STAGEDIR}${FONTDIR} @cd ${WRKDIR}/ked && ${COPYTREE_SHARE} "${FONTFILES}" ${STAGEDIR}${FONTDIR} .include Index: head/korean/hpscat/distinfo =================================================================== --- head/korean/hpscat/distinfo (revision 546703) +++ head/korean/hpscat/distinfo (revision 546704) @@ -1,4 +1,5 @@ +TIMESTAMP = 1598588073 SHA256 (hpscat-jshin.tar.gz) = 621403a0d49779cdf7936b91ae7a2200f9ac94ec75fbc0ca9488196cef5c6f25 SIZE (hpscat-jshin.tar.gz) = 26075 SHA256 (ked.tar.gz) = fa3b9674609b10b5fe4d96ca2a801fb5d50d8281d0f52120319013fd6e3c6c21 SIZE (ked.tar.gz) = 305769 Index: head/korean/hpscat/files/patch-Makefile =================================================================== --- head/korean/hpscat/files/patch-Makefile (revision 546703) +++ head/korean/hpscat/files/patch-Makefile (revision 546704) @@ -1,18 +1,18 @@ ---- Makefile.orig Wed Nov 22 07:42:41 1995 -+++ Makefile Sat Mar 30 19:22:22 2002 -@@ -11,10 +11,12 @@ +--- Makefile.orig 1995-11-22 15:42:41 UTC ++++ Makefile +@@ -11,10 +11,12 @@ DHPS = DADVHF = -DADV_HFONT #DADVHF = # define if you want to make the default paper size US letter instead of A4 -DUS = -DUS_VERSION -#DUS = -CFLAGS = -O $(DHPS) $(DADVHF) $(DUS) +#DUS = -DUS_VERSION +DUS = +CFLAGS += $(DHPS) $(DADVHF) $(DUS) LDFLAGS = -s + +all: $(PRG) $(PRG): $(OBJ) $(CC) $(LDFLAGS) -o $@ $(OBJ) Index: head/korean/hpscat/files/patch-hpscat.h =================================================================== --- head/korean/hpscat/files/patch-hpscat.h (revision 546703) +++ head/korean/hpscat/files/patch-hpscat.h (revision 546704) @@ -1,28 +1,29 @@ ---- hpscat.h.orig 1995-11-23 05:16:11.000000000 -0500 -+++ hpscat.h 2013-06-12 18:37:53.000000000 -0400 +--- hpscat.h.orig 1995-11-23 10:16:11 UTC ++++ hpscat.h @@ -49,9 +49,11 @@ \*------------------------------*/ #include -#include +#include #include +#include #include +#include #ifdef __GNUC__ # define PROT(x) x -@@ -186,4 +188,12 @@ +@@ -185,5 +187,13 @@ extern bool cheat; /* true if cheating */ + extern bool narrow; /* false if normal courier is used */ extern FILE *fp; /* file pointer to input file */ extern FILE *ofp; /* file pointer to output file */ - ++ +void endfile(void); +void fatal(char *); +int fillpagebuf(void); +int find_f(int, int, int); +int find_l(int, int, int); +int find_m(int, int, int); +int find_set(int); -+ + /*** EOF ***/ Index: head/korean/hpscat/files/patch-init.c =================================================================== --- head/korean/hpscat/files/patch-init.c (revision 546703) +++ head/korean/hpscat/files/patch-init.c (revision 546704) @@ -1,11 +1,19 @@ ---- init.c.orig 1995-11-23 17:18:58.000000000 -0500 -+++ init.c 2013-06-12 17:34:31.000000000 -0400 -@@ -211,7 +211,7 @@ +--- init.c.orig 1995-11-23 22:18:58 UTC ++++ init.c +@@ -19,7 +19,6 @@ char *title; + PAPER paper; + int min_bm; + int min_lm; +-int s_width; + int s_width_nl; + + /* Exact hangul Postscript font names +@@ -211,7 +210,7 @@ setnalza() Time = localtime(&T.tv_sec); sprintf(nalza, "%02d:%02d, %d/%d/%d", Time->tm_hour, Time->tm_min, - Time->tm_mon+1, Time->tm_mday, Time->tm_year ); + Time->tm_mon+1, Time->tm_mday, Time->tm_year + 1900); } /*** EOF ***/ Index: head/korean/hpscat/files/patch-misc.c =================================================================== --- head/korean/hpscat/files/patch-misc.c (revision 546703) +++ head/korean/hpscat/files/patch-misc.c (revision 546704) @@ -1,21 +1,21 @@ ---- misc.c.orig 1995-11-23 15:40:07.000000000 -0500 -+++ misc.c 2013-06-12 18:43:01.000000000 -0400 +--- misc.c.orig 1995-11-23 20:40:07 UTC ++++ misc.c @@ -2,8 +2,8 @@ #include "hpscat.h" #include "paper.h" -extern totalpages; -static converted; +extern int totalpages; +static int converted; char *tmpfn; void -@@ -36,6 +36,7 @@ +@@ -36,6 +36,7 @@ convert(s) #endif case Nbyte: strcpy(args[1], fromN); break; case ISO: strcpy(args[1], fromI); break; + default: /* NOTREACHED */ return; } execute(args); fclose(fp); Index: head/korean/hpscat/files/patch-paper.h =================================================================== --- head/korean/hpscat/files/patch-paper.h (revision 546703) +++ head/korean/hpscat/files/patch-paper.h (revision 546704) @@ -1,22 +1,22 @@ ---- paper.h.orig 1995-11-23 02:56:27.000000000 -0500 -+++ paper.h 2013-06-12 16:57:50.000000000 -0400 -@@ -5,7 +5,7 @@ +--- paper.h.orig 1995-11-23 07:56:27 UTC ++++ paper.h +@@ -5,7 +5,7 @@ typedef struct { char name[12]; add other paper types like b4 and b5 before the last entry 'user' here and their dimensions to the array 'papersize' in paper.c */ typedef enum {a3,a4,a5,b4,b5,letter,t10x14,legal,executive, - folio,quarto,statement,ledger,tabloid,user} PAPER; + folio,quarto,statement,ledger,tabloid,c5,user} PAPER; /* mnemonics for length unit add other unit such as pica and conversion factor to standard -@@ -54,8 +54,8 @@ +@@ -54,8 +54,8 @@ extern void setmargin(); #define ABS_MIN_LM 18 /* depends on printer */ -extern s_width; -extern s_width_nl; +extern int s_width; +extern int s_width_nl; extern int l_width,l_height,l_lm1,l_lm2,l_bm,l_tm; extern int l3_width,l3_height,l3_lm1,l3_lm2,l3_lm3,l3_bm,l3_tm; extern int p_width,p_height,p_lm,p_bm,p_tm; Index: head/korean/hpscat/files/patch-showbuf.c =================================================================== --- head/korean/hpscat/files/patch-showbuf.c (revision 546703) +++ head/korean/hpscat/files/patch-showbuf.c (revision 546704) @@ -1,19 +1,19 @@ ---- showbuf.c.orig 1995-11-23 07:01:36.000000000 -0500 -+++ showbuf.c 2013-06-12 17:15:47.000000000 -0400 -@@ -210,7 +210,7 @@ +--- showbuf.c.orig 1995-11-23 12:01:36 UTC ++++ showbuf.c +@@ -210,7 +210,7 @@ teduri(fname) fprintf(ofp,"90 rotate 0 %d translate ", - papersize[paper].width); fprintf(ofp," %f 1 scale\n",HOR_SCALE_FAC); - if(nobox == False) + if(nobox == False) { if(layout==Sero) { box(p_lm, p_bm, p_width, p_height); fillbox(p_lm, p_bm, s_width, p_height); -@@ -236,6 +236,7 @@ +@@ -236,6 +236,7 @@ teduri(fname) fillbox(l3_lm2, l3_bm, s_width, l3_height); fillbox(l3_lm3, l3_bm, s_width, l3_height); } + } if(noheader == False) { x = (layout==Sero||layout==Sero2) ? p_lm : l_lm1; y = (layout==Sero||layout==Sero2) ? p_tm : l_tm; Index: head/korean/hpscat/files/patch-user.c =================================================================== --- head/korean/hpscat/files/patch-user.c (revision 546703) +++ head/korean/hpscat/files/patch-user.c (revision 546704) @@ -1,10 +1,10 @@ ---- user.c.orig 1995-11-23 05:17:16.000000000 -0500 -+++ user.c 2013-06-12 17:24:33.000000000 -0400 -@@ -37,7 +37,6 @@ +--- user.c.orig 1995-11-23 10:17:16 UTC ++++ user.c +@@ -37,7 +37,6 @@ read_rc() char buf[BUFSIZ]; char *home; FILE *fp; - extern char *getenv PROT((char *)); home = getenv("HOME"); if(strlen(home)==0) return;