From 59a19c1c9882f7883da441a348cc704958b565a6 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Fri, 28 Aug 2020 04:17:41 +0000 Subject: - Unbreak. The FTP server was restored recently. - Fix build with Clang 11 (-fno-common). --- korean/hpscat/Makefile | 4 ---- korean/hpscat/distinfo | 1 + korean/hpscat/files/patch-Makefile | 6 +++--- korean/hpscat/files/patch-hpscat.h | 11 ++++++----- korean/hpscat/files/patch-init.c | 14 +++++++++++--- korean/hpscat/files/patch-misc.c | 6 +++--- korean/hpscat/files/patch-paper.h | 8 ++++---- korean/hpscat/files/patch-showbuf.c | 8 ++++---- korean/hpscat/files/patch-user.c | 6 +++--- 9 files changed, 35 insertions(+), 29 deletions(-) (limited to 'korean') diff --git a/korean/hpscat/Makefile b/korean/hpscat/Makefile index b7ac41974617..c901f461ad78 100644 --- a/korean/hpscat/Makefile +++ b/korean/hpscat/Makefile @@ -17,10 +17,6 @@ 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} diff --git a/korean/hpscat/distinfo b/korean/hpscat/distinfo index a8d82faf84fd..8e6c570425dc 100644 --- a/korean/hpscat/distinfo +++ b/korean/hpscat/distinfo @@ -1,3 +1,4 @@ +TIMESTAMP = 1598588073 SHA256 (hpscat-jshin.tar.gz) = 621403a0d49779cdf7936b91ae7a2200f9ac94ec75fbc0ca9488196cef5c6f25 SIZE (hpscat-jshin.tar.gz) = 26075 SHA256 (ked.tar.gz) = fa3b9674609b10b5fe4d96ca2a801fb5d50d8281d0f52120319013fd6e3c6c21 diff --git a/korean/hpscat/files/patch-Makefile b/korean/hpscat/files/patch-Makefile index a20c03072edd..63aaad9a0b3c 100644 --- a/korean/hpscat/files/patch-Makefile +++ b/korean/hpscat/files/patch-Makefile @@ -1,6 +1,6 @@ ---- 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 diff --git a/korean/hpscat/files/patch-hpscat.h b/korean/hpscat/files/patch-hpscat.h index 0ce84cff1334..3b4143868185 100644 --- a/korean/hpscat/files/patch-hpscat.h +++ b/korean/hpscat/files/patch-hpscat.h @@ -1,5 +1,5 @@ ---- 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 @@ \*------------------------------*/ @@ -13,10 +13,11 @@ #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); @@ -24,5 +25,5 @@ +int find_l(int, int, int); +int find_m(int, int, int); +int find_set(int); -+ + /*** EOF ***/ diff --git a/korean/hpscat/files/patch-init.c b/korean/hpscat/files/patch-init.c index 66f90455914a..4f5b2040fb37 100644 --- a/korean/hpscat/files/patch-init.c +++ b/korean/hpscat/files/patch-init.c @@ -1,6 +1,14 @@ ---- 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, diff --git a/korean/hpscat/files/patch-misc.c b/korean/hpscat/files/patch-misc.c index 2ead275084fc..36c62278587c 100644 --- a/korean/hpscat/files/patch-misc.c +++ b/korean/hpscat/files/patch-misc.c @@ -1,5 +1,5 @@ ---- 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" @@ -11,7 +11,7 @@ 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; diff --git a/korean/hpscat/files/patch-paper.h b/korean/hpscat/files/patch-paper.h index ae5dd5537d8b..ab53b278597d 100644 --- a/korean/hpscat/files/patch-paper.h +++ b/korean/hpscat/files/patch-paper.h @@ -1,6 +1,6 @@ ---- 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, @@ -9,7 +9,7 @@ /* 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 */ diff --git a/korean/hpscat/files/patch-showbuf.c b/korean/hpscat/files/patch-showbuf.c index 3e4f46cc2284..71967e8e3593 100644 --- a/korean/hpscat/files/patch-showbuf.c +++ b/korean/hpscat/files/patch-showbuf.c @@ -1,6 +1,6 @@ ---- 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); @@ -9,7 +9,7 @@ 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); } diff --git a/korean/hpscat/files/patch-user.c b/korean/hpscat/files/patch-user.c index 242f44720807..90d49133b214 100644 --- a/korean/hpscat/files/patch-user.c +++ b/korean/hpscat/files/patch-user.c @@ -1,6 +1,6 @@ ---- 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; -- cgit v1.2.3