From owner-freebsd-ports Sun Sep 13 02:30:08 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id CAA06975 for freebsd-ports-outgoing; Sun, 13 Sep 1998 02:30:08 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA06959 for ; Sun, 13 Sep 1998 02:30:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id CAA02263; Sun, 13 Sep 1998 02:30:04 -0700 (PDT) Received: from punky.snu.ac.kr (punky.snu.ac.kr [147.46.59.58]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id CAA06358 for ; Sun, 13 Sep 1998 02:20:34 -0700 (PDT) (envelope-from pwd@punky.snu.ac.kr) Received: (from pwd@localhost) by punky.snu.ac.kr (8.8.8/8.8.8) id SAA05819; Sun, 13 Sep 1998 18:20:14 +0900 (KST) (envelope-from pwd) Message-Id: <199809130920.SAA05819@punky.snu.ac.kr> Date: Sun, 13 Sep 1998 18:20:14 +0900 (KST) From: junker@jazz.snu.ac.kr Reply-To: junker@jazz.snu.ac.kr To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/7913: port upgrade: korean/h2ps Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 7913 >Category: ports >Synopsis: port upgrade: korean/h2ps >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Sep 13 02:30:02 PDT 1998 >Last-Modified: >Originator: CHOI Junho >Organization: NARAE, CS Dept., Seoul National Univ., ROK >Release: FreeBSD 2.2.7-STABLE i386 >Environment: FreeBSD punky.snu.ac.kr 2.2.7-STABLE FreeBSD 2.2.7-STABLE #0: Tue Sep 8 12:10:01 KST 1998 pwd@punky.snu.ac.kr:/allegro/2.2-src/sys/compile/PUNKY i386 >Description: Regular Port upgrade(korean/h2ps) >How-To-Repeat: >Fix: Apply the following diffs: diff -uNr --exclude=CVS --exclude=README.html /usr/ports/korean/h2ps/Makefile ./Makefile --- /usr/ports/korean/h2ps/Makefile Thu Aug 13 16:18:01 1998 +++ ./Makefile Sun Sep 13 18:13:27 1998 @@ -1,19 +1,19 @@ -# New ports collection makefile for: h2ps-2.0 -# Version required: 2.0 +# New ports collection makefile for: h2ps-2.06 +# Version required: 2.06 # Date created: 20 May 1997 # Whom: CHOI Junho # # $Id: Makefile,v 1.5 1998/08/13 07:18:01 asami Exp $ # +# Thanks to SungGon Yi for advising 2.06 ports +# -DISTNAME= h2ps-2.00 -PKGNAME= ko-h2ps-a4-2.0 +DISTNAME= h2ps-2.06 +PKGNAME= ko-h2ps-2.06 CATEGORIES= korean print MASTER_SITES= ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ MAINTAINER= junker@jazz.snu.ac.kr - -BROKEN= fetch pre-build: @(cd ${WRKSRC}; make clean) diff -uNr --exclude=CVS --exclude=README.html /usr/ports/korean/h2ps/files/md5 ./files/md5 --- /usr/ports/korean/h2ps/files/md5 Sun Aug 9 09:54:34 1998 +++ ./files/md5 Sat Sep 12 02:31:11 1998 @@ -1 +1 @@ -MD5 (h2ps-2.00.tar.gz) = 529c4243512f04984762d32584f513a8 +MD5 (h2ps-2.06.tar.gz) = 726fea63114f453dcf41b74966bdc3b8 diff -uNr --exclude=CVS --exclude=README.html /usr/ports/korean/h2ps/patches/patch-aa ./patches/patch-aa --- /usr/ports/korean/h2ps/patches/patch-aa Sun Aug 9 09:54:34 1998 +++ ./patches/patch-aa Sun Sep 13 18:03:51 1998 @@ -1,20 +1,15 @@ ---- h2ps.c.orig Fri Aug 7 01:41:12 1998 -+++ h2ps.c Sat Aug 8 09:54:44 1998 -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - #include "ncode.h" - #include "npsr.h" -@@ -177,6 +178,9 @@ +--- h2ps.c.bak Sun Sep 13 17:59:29 1998 ++++ h2ps.c Sun Sep 13 18:02:18 1998 +@@ -233,6 +233,12 @@ fputs("%%Creator: h2ps\n", out); fprintf(out, "%%%%CreationDate: %s\n", date_str); fputs("%%Pages: (atend)\n", out); + fputs("%%PageOrder: Ascend\n", out); -+ fputs("%%DocumentData: Clean8Bit\n", out); -+ fputs("%%DocumentPaperSizes: A4\n", out); ++ fputs("%%DocumentData: Clean7Bit\n", out); ++ if (page_width==595) /* A4-sized */ ++ fputs("%%DocumentPaperSizes: A4\n", out); ++ if (page_width==612) /* Letter-sized */ ++ fputs("%%DocumentPaperSizes: Letter\n", out); fputs("%%EndComments\n", out); npsr_insert_resource(out, NPSR_FONT, "n3f-5"); diff -uNr --exclude=CVS --exclude=README.html /usr/ports/korean/h2ps/patches/patch-ab ./patches/patch-ab --- /usr/ports/korean/h2ps/patches/patch-ab Tue Mar 25 19:47:27 1997 +++ ./patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,167 +0,0 @@ -*** h2ps.c.ori Tue Mar 25 19:04:43 1997 ---- h2ps.c Tue Mar 25 19:04:49 1997 -*************** -*** 219,230 **** - /* - * Default page dimensions - */ - #ifndef WIDTH -! #define WIDTH 8.27 - #endif - - #ifndef HEIGHT -! #define HEIGHT 11.64 - #endif - - #ifndef MARGIN ---- 219,235 ---- - /* - * Default page dimensions - */ -+ #define USA_WIDTH 8.5 -+ #define USA_HEIGHT 11.0 -+ #define A4_WIDTH 8.27 -+ #define A4_HEIGHT 11.64 -+ - #ifndef WIDTH -! #define WIDTH A4_WIDTH - #endif - - #ifndef HEIGHT -! #define HEIGHT A4_HEIGHT - #endif - - #ifndef MARGIN -*************** -*** 426,431 **** ---- 431,439 ---- - /* - * Sheet dimensions - */ -+ double paper_height = HEIGHT; /* Paper height */ -+ double paper_width = WIDTH; /* Paper width */ -+ - double page_height = HEIGHT; /* Paper height */ - double page_width = WIDTH; /* Paper width */ - -*************** -*** 446,451 **** ---- 454,464 ---- - fprintf(stderr,"pos. = -#num\t\tnumber of copies to print\n"); - fprintf(stderr," -1\t\tone page per sheet\n"); - fprintf(stderr," -2\t\tTWIN PAGES per sheet\n"); -+ #if A4_PAPERSIZE == 1 -+ fprintf(stderr," -a\t\tUse USA paper size (8.5\" x 11\")\n"); -+ #else -+ fprintf(stderr," -a\t\tUse A4 paper size (21cm x 29.56cm (8.27\" 11.64\"))\n"); -+ #endif - fprintf(stderr," -d\t-nd\tprint (DON'T PRINT) current date at the bottom\n"); - fprintf(stderr," -Fnum\t\tfont size, num is a float number\n"); - fprintf(stderr," -Hstr\t\tuse str like header title for subsequent files\n"); -*************** -*** 528,533 **** ---- 541,552 ---- - usage(EXIT_FAILURE); - interpret = TRUE; - break; -+ case 'a': /* American paper sizes */ -+ #if defined(USA_HEIGHT) && defined(USA_WIDTH) -+ paper_height = USA_HEIGHT; -+ paper_width = USA_WIDTH; -+ #endif -+ break; - case 'n': - if (arg[2] == NUL) - return; -*************** -*** 778,785 **** - /* - * This routine buffers a line of input, release one character at a time - * or a whole sequence of characters with some meaning like bold sequences -! * produced by nroff (no others sequences are recognized by the moment): -! * <\b><\b><\b> - */ - int - mygetc(statusp) ---- 797,805 ---- - /* - * This routine buffers a line of input, release one character at a time - * or a whole sequence of characters with some meaning like bold sequences -! * or underlining produced by nroff. -! * <\b> -! * <_><\b> - */ - int - mygetc(statusp) -*************** -*** 807,822 **** - if (buffer[curr+1] != '\b') /* this is not a special sequence */ - return buffer[curr++]; - -! /* Check if it is a bold sequence */ -! c = buffer[curr++]; -! if (c == buffer[curr+1] && -! buffer[curr] == buffer[curr+2] && -! c == buffer[curr+3] && -! buffer[curr] == buffer[curr+4] && -! c == buffer[curr+5]) - { - *statusp = IS_BOLD; -! curr += 6; - } - - /* Return the first character of the sequence */ ---- 827,841 ---- - if (buffer[curr+1] != '\b') /* this is not a special sequence */ - return buffer[curr++]; - -! /* check if we're underlining */ -! if (buffer[curr] == '_') -! return buffer[curr++]; -! -! /* Check if it is a bold sequence */ -! if ((c = buffer[curr]) == buffer[curr+2]) - { - *statusp = IS_BOLD; -! curr += 3; - } - - /* Return the first character of the sequence */ -*************** -*** 1590,1597 **** - printf("\n%% Initialize page description variables.\n"); - printf("/x0 0 def\n"); - printf("/y0 0 def\n"); -! printf("/sh %g inch def\n", (double)HEIGHT); -! printf("/sw %g inch def\n", (double)WIDTH); - printf("/margin %g inch def\n", (double)MARGIN); - printf("/rm margin 3 div def\n"); - printf("/lm margin 2 mul 3 div def\n"); ---- 1609,1616 ---- - printf("\n%% Initialize page description variables.\n"); - printf("/x0 0 def\n"); - printf("/y0 0 def\n"); -! printf("/sh %g inch def\n", (double)paper_height); -! printf("/sw %g inch def\n", (double)paper_width); - printf("/margin %g inch def\n", (double)MARGIN); - printf("/rm margin 3 div def\n"); - printf("/lm margin 2 mul 3 div def\n"); -*************** -*** 1884,1891 **** - /* Initialize variables not depending of positional options */ - landscape = twinpages = -1; /* To force format switching */ - fontsize = -1.0; /* To force fontsize switching */ -! page_height = (double)(HEIGHT - MARGIN) * PIXELS_INCH; -! page_width = (double)(WIDTH - MARGIN) * PIXELS_INCH; - - /* Postcript prologue printing */ - print_prologue(); ---- 1903,1910 ---- - /* Initialize variables not depending of positional options */ - landscape = twinpages = -1; /* To force format switching */ - fontsize = -1.0; /* To force fontsize switching */ -! page_height = (double)(paper_height - MARGIN) * PIXELS_INCH; -! page_width = (double)(paper_width - MARGIN) * PIXELS_INCH; - - /* Postcript prologue printing */ - print_prologue(); diff -uNr --exclude=CVS --exclude=README.html /usr/ports/korean/h2ps/patches/patch-ac ./patches/patch-ac --- /usr/ports/korean/h2ps/patches/patch-ac Tue Mar 25 19:47:28 1997 +++ ./patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,43 +0,0 @@ -*** ../h2ps-1.0-orig/Makefile Wed Mar 19 21:29:14 1997 ---- Makefile Wed Mar 19 21:53:13 1997 -*************** -*** 63,79 **** - # stupid a**holes who add non-compatible "features" - SHELL =/bin/sh - -! CC =gcc - - D =. - O =. - -! BINDIR =/usr/local/bin - -! MANDIR =/usr/man/mann -! MANEXT =n - -! CFLAGS = -O # -DBSD -DLPR_PRINT - # Default values for HEIGHT, WIDTH, MARGIN and DIR_SEP (11.64, 8.27, 1.2, '/'). - # Default values for LPR_COMMAND and LPR_OPT ("lpr", "-l") - # No values for TWOSIDED_DFLT, ONESIDED and TWOSIDED ---- 63,83 ---- - # stupid a**holes who add non-compatible "features" - SHELL =/bin/sh - -! CC = gcc - - D =. - O =. - -! ##BINDIR =/usr/local/bin -! BINDIR = $(PREFIX)/bin - -! ##MANDIR =/usr/man/mann -! ##MANEXT =n -! MANEXT = 1 -! MANDIR = $(PREFIX)/man/man$(MANEXT) - -! #CFLAGS = -O # -DBSD -DLPR_PRINT -! CFLAGS = -O -DBSD -DWIDTH=$(WIDTH) -DHEIGHT=$(HEIGHT) -DA4_PAPERSIZE=$(A4_PAPERSIZE) - # Default values for HEIGHT, WIDTH, MARGIN and DIR_SEP (11.64, 8.27, 1.2, '/'). - # Default values for LPR_COMMAND and LPR_OPT ("lpr", "-l") - # No values for TWOSIDED_DFLT, ONESIDED and TWOSIDED >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message