From owner-svn-ports-head@freebsd.org Fri Aug 28 03:46:45 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 02EB23CC6AC; Fri, 28 Aug 2020 03:46:45 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bd5BD6LBkz3gHw; Fri, 28 Aug 2020 03:46:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3BDAE966; Fri, 28 Aug 2020 03:46:44 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07S3kiS9084024; Fri, 28 Aug 2020 03:46:44 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07S3kf4x084006; Fri, 28 Aug 2020 03:46:41 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202008280346.07S3kf4x084006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 28 Aug 2020 03:46:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546701 - in head: . korean korean/hpscat korean/hpscat/files X-SVN-Group: ports-head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in head: . korean korean/hpscat korean/hpscat/files X-SVN-Commit-Revision: 546701 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 03:46:45 -0000 Author: jkim Date: Fri Aug 28 03:46:41 2020 New Revision: 546701 URL: https://svnweb.freebsd.org/changeset/ports/546701 Log: - Re-add korean/hpscat. The FTP server was restored recently. - Fix build with Clang 11. Added: head/korean/hpscat/ head/korean/hpscat/Makefile (contents, props changed) head/korean/hpscat/distinfo (contents, props changed) head/korean/hpscat/files/ head/korean/hpscat/files/hpscat.sh.in (contents, props changed) head/korean/hpscat/files/patch-Makefile (contents, props changed) head/korean/hpscat/files/patch-hpscat.c (contents, props changed) head/korean/hpscat/files/patch-hpscat.h (contents, props changed) head/korean/hpscat/files/patch-init.c (contents, props changed) head/korean/hpscat/files/patch-misc.c (contents, props changed) head/korean/hpscat/files/patch-paper.h (contents, props changed) head/korean/hpscat/files/patch-showbuf.c (contents, props changed) head/korean/hpscat/files/patch-user.c (contents, props changed) head/korean/hpscat/files/pkg-message.in (contents, props changed) head/korean/hpscat/pkg-descr (contents, props changed) Modified: head/MOVED head/korean/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Aug 28 03:39:25 2020 (r546700) +++ head/MOVED Fri Aug 28 03:46:41 2020 (r546701) @@ -15393,7 +15393,6 @@ games/xminesweep||2020-08-27|Has expired: Broken for m graphics/backfract||2020-08-27|Has expired: Broken for more than 6 months japanese/kanjipad||2020-08-27|Has expired: Broken for more than 6 months japanese/xdtp||2020-08-27|Has expired: Broken for more than 6 months -korean/hpscat||2020-08-27|Has expired: Broken for more than 6 months math/barvinok||2020-08-27|Has expired: Broken for more than 6 months math/openmesh||2020-08-27|Has expired: Broken for more than 6 months math/rehearse||2020-08-27|Has expired: Broken for more than 6 months Modified: head/korean/Makefile ============================================================================== --- head/korean/Makefile Fri Aug 28 03:39:25 2020 (r546700) +++ head/korean/Makefile Fri Aug 28 03:46:41 2020 (r546701) @@ -15,6 +15,7 @@ SUBDIR += hanyangfonts SUBDIR += hcode SUBDIR += hmconv + SUBDIR += hpscat SUBDIR += hunspell SUBDIR += ibus-hangul SUBDIR += imhangul-gtk2 Added: head/korean/hpscat/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/Makefile Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +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 + +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 Added: head/korean/hpscat/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/distinfo Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,5 @@ +TIMESTAMP = 1598586366 +SHA256 (hpscat-jshin.tar.gz) = 621403a0d49779cdf7936b91ae7a2200f9ac94ec75fbc0ca9488196cef5c6f25 +SIZE (hpscat-jshin.tar.gz) = 26075 +SHA256 (ked.tar.gz) = fa3b9674609b10b5fe4d96ca2a801fb5d50d8281d0f52120319013fd6e3c6c21 +SIZE (ked.tar.gz) = 305769 Added: head/korean/hpscat/files/hpscat.sh.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/hpscat.sh.in Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,32 @@ +#!/bin/sh +# +# hpscat fontend for FreeBSD ports +# +# 4 Apr 1997, Choi Jun Ho +# +# It enables hpscat to print file without loading font in gs +# + +HFONTPATH=%%FONTDIR%% + +options=$* +fileoutput=0 + +# check if -f option is specified +for i in $* +do + case $i in + -f) fileoutput=1; shift;; + esac +done + +if [ $fileoutput != 1 ]; then +# print font header + cat $HFONTPATH/Header + for hfont in Munjo Gotic MunjoBold PCMunjo + do + cat $HFONTPATH/$hfont + done +fi + +exec hpscat.bin $options Added: head/korean/hpscat/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-Makefile Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,18 @@ +--- 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) Added: head/korean/hpscat/files/patch-hpscat.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-hpscat.c Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,11 @@ +--- hpscat.c.orig 2019-08-03 11:25:44 UTC ++++ hpscat.c +@@ -62,7 +62,7 @@ open_outfile(s) /* returns -1 if can + if(ofp=fopen(buf,"r")) { /* file exists */ + fclose(ofp); + fprintf(stderr,"output file %s exists...overwrite? ", buf); +- gets(ans); ++ fgets(buf,256,ans); + if(ans[0]=='y') + unlink(buf); + else Added: head/korean/hpscat/files/patch-hpscat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-hpscat.h Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,29 @@ +--- 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 +@@ -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 ***/ Added: head/korean/hpscat/files/patch-init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-init.c Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,19 @@ +--- 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 ***/ Added: head/korean/hpscat/files/patch-misc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-misc.c Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,21 @@ +--- 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 @@ convert(s) + #endif + case Nbyte: strcpy(args[1], fromN); break; + case ISO: strcpy(args[1], fromI); break; ++ default: /* NOTREACHED */ return; + } + execute(args); + fclose(fp); Added: head/korean/hpscat/files/patch-paper.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-paper.h Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,22 @@ +--- 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 @@ 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; Added: head/korean/hpscat/files/patch-showbuf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-showbuf.c Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,19 @@ +--- 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 @@ 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; Added: head/korean/hpscat/files/patch-user.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/patch-user.c Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,10 @@ +--- 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; Added: head/korean/hpscat/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/korean/hpscat/files/pkg-message.in Fri Aug 28 03:46:41 2020 (r546701) @@ -0,0 +1,9 @@ +[ +{ type: install + message: <.