From owner-freebsd-ports Thu Jan 13 12:50:29 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 986F6155A5 for ; Thu, 13 Jan 2000 12:50:08 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA95946; Thu, 13 Jan 2000 12:50:08 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C468151CC; Thu, 13 Jan 2000 12:43:13 -0800 (PST) Message-Id: <20000113204313.2C468151CC@hub.freebsd.org> Date: Thu, 13 Jan 2000 12:43:13 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/16108: Update port: japanese/lipsf to 1.14a Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16108 >Category: ports >Synopsis: Update port: japanese/lipsf to 1.14a >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 13 12:50:07 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.14a New file: patches/patch-ab patches/patch-ac Remove file: patches/patch-aa Approved by maintainer. >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/lipsf/Makefile japanese/lipsf/Makefile --- /usr/ports/japanese/lipsf/Makefile Wed Aug 25 19:17:10 1999 +++ japanese/lipsf/Makefile Wed Jan 12 20:51:49 2000 @@ -1,29 +1,30 @@ # New ports collection makefile for: lipsf -# Version required: 1.13c +# Version required: 1.14a # Date created: 6 Dec 1996 # Whom: Mita Yoshio # # $FreeBSD: ports/japanese/lipsf/Makefile,v 1.5 1999/08/25 05:25:16 obrien Exp $ # -DISTNAME= lipsf113 -PKGNAME= ja-lipsf-1.13c +DISTNAME= lpsf114a +PKGNAME= ja-lipsf-1.14a CATEGORIES= japanese print -MASTER_SITES= ftp://ftp.eos.hokudai.ac.jp/pub/tools/ - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCHFILES= lipsf113c.patch.gz +MASTER_SITES= ftp://ftp.vector.co.jp/pack/unix/writing/print/ +EXTRACT_SUFX= .tgz MAINTAINER= mita@jp.FreeBSD.org +WRKSRC= ${WRKDIR}/lipsf-114a + MANLANG= ja MAN1= lipsf.1 pols.1 -DOCDIR= ${PREFIX}/share/doc/lipsf - post-install: - ${MKDIR} ${DOCDIR} - (cd ${WRKSRC} ; \ - ${INSTALL_DATA} HISTORY Install README TECHKNOW ${DOCDIR}) +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/lipsf +.for file in HISTORY Install README TECHKNOW + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/lipsf +.endfor +.endif .include diff -urN /usr/ports/japanese/lipsf/files/md5 japanese/lipsf/files/md5 --- /usr/ports/japanese/lipsf/files/md5 Thu Dec 19 12:36:14 1996 +++ japanese/lipsf/files/md5 Wed Jan 12 18:59:41 2000 @@ -1,2 +1 @@ -MD5 (lipsf113.tar.gz) = b3351eb8ed91a65541d38daae4b8e9c7 -MD5 (lipsf113c.patch.gz) = ff92a2fe677d9d743b41f12d313048fb +MD5 (lpsf114a.tgz) = e74daeea4ef8dad0b87b1bd33a20edc8 diff -urN /usr/ports/japanese/lipsf/patches/patch-aa japanese/lipsf/patches/patch-aa --- /usr/ports/japanese/lipsf/patches/patch-aa Fri Jun 5 07:43:59 1998 +++ japanese/lipsf/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,177 +0,0 @@ -*** Makefile.orig Mon Dec 9 21:33:15 1996 ---- Makefile Mon Dec 9 21:33:21 1996 -*************** -*** 7,13 **** - CPP = $(CC) -E - SED = sed - -! goal: Makefile.tmp - $(MAKE) -f Makefile.tmp - - Makefile.tmp: Makefile.in mkmf.sed ---- 7,13 ---- - CPP = $(CC) -E - SED = sed - -! all: Makefile.tmp - $(MAKE) -f Makefile.tmp - - Makefile.tmp: Makefile.in mkmf.sed -*** Makefile.in.orig Thu Apr 11 11:20:50 1996 ---- Makefile.in Mon Dec 9 21:33:05 1996 -*************** -*** 3,13 **** - # - - TITLE = lipsf -! TOPDIR = __S__usr__S__local - BINDIR = $(TOPDIR)__S__bin -! MANDIR = $(TOPDIR)__S__man__S__man$(MANSEC) -! CATDIR = $(TOPDIR)__S__man__S__cat$(MANSEC) -! INSTALL = cp -p - CHMOD = chmod - MANSEC = 1 - ---- 3,16 ---- - # - - TITLE = lipsf -! PREFIX ?= __S__usr__S__local -! TOPDIR = $(PREFIX) - BINDIR = $(TOPDIR)__S__bin -! MANDIR = $(TOPDIR)__S__man__S____LANG____S__man$(MANSEC) -! CATDIR = $(TOPDIR)__S__man__S____LANG____S__cat$(MANSEC) -! INSTALL = __ICMD__ -! INSTBINFLAGS = __IBINFLG__ -! INSTMANFLAGS = __IMANFLG__ - CHMOD = chmod - MANSEC = 1 - -*************** -*** 90,114 **** - # to install all - - install: $(LIPSFB) $(POLSB) $(LIPSF).$(MANSEC) $(POLS).$(MANSEC) -! $(INSTALL) $(LIPSFB) $(BINDIR) - $(CHMOD) a+rx $(BINDIR)__S__$(LIPSFB) -! $(INSTALL) $(POLSB) $(BINDIR) - $(CHMOD) a+rx $(BINDIR)__S__$(POLSB) -! $(INSTALL) $(LIPSF).$(MANSEC) $(MANDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(MANDIR)__S__$(LIPSFB).$(MANSEC) -! $(INSTALL) $(POLS).$(MANSEC) $(MANDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(MANDIR)__S__$(POLSB).$(MANSEC) - - catman: $(LIPSF).$(MANSEC)c $(POLS).$(MANSEC)c -! $(INSTALL) $(LIPSF).$(MANSEC)c $(CATDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(LIPSF).$(MANSEC) -! $(INSTALL) $(POLS).$(MANSEC)c $(CATDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(POLS).$(MANSEC) - - catman-b: $(LIPSF).doc $(POLS).doc -! $(INSTALL) $(LIPSF).doc $(CATDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(LIPSF).$(MANSEC) -! $(INSTALL) $(POLS).doc $(CATDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(POLS).$(MANSEC) - - compman: catman ---- 93,117 ---- - # to install all - - install: $(LIPSFB) $(POLSB) $(LIPSF).$(MANSEC) $(POLS).$(MANSEC) -! $(INSTALL) $(INSTBINFLAGS) $(LIPSFB) $(BINDIR) - $(CHMOD) a+rx $(BINDIR)__S__$(LIPSFB) -! $(INSTALL) $(INSTBINFLAGS) $(POLSB) $(BINDIR) - $(CHMOD) a+rx $(BINDIR)__S__$(POLSB) -! $(INSTALL) $(INSTMANFLAGS) $(LIPSF).$(MANSEC) $(MANDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(MANDIR)__S__$(LIPSFB).$(MANSEC) -! $(INSTALL) $(INSTMANFLAGS) $(POLS).$(MANSEC) $(MANDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(MANDIR)__S__$(POLSB).$(MANSEC) - - catman: $(LIPSF).$(MANSEC)c $(POLS).$(MANSEC)c -! $(INSTALL) $(INSTMANFLAGS) $(LIPSF).$(MANSEC)c $(CATDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(LIPSF).$(MANSEC) -! $(INSTALL) $(INSTMANFLAGS) $(POLS).$(MANSEC)c $(CATDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(POLS).$(MANSEC) - - catman-b: $(LIPSF).doc $(POLS).doc -! $(INSTALL) $(INSTMANFLAGS) $(LIPSF).doc $(CATDIR)__S__$(LIPSF).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(LIPSF).$(MANSEC) -! $(INSTALL) $(INSTMANFLAGS) $(POLS).doc $(CATDIR)__S__$(POLS).$(MANSEC) - $(CHMOD) a+r $(CATDIR)__S__$(POLS).$(MANSEC) - - compman: catman -*** lipsf.h.orig Mon Dec 9 21:34:09 1996 ---- lipsf.h Mon Dec 9 21:34:46 1996 -*************** -*** 223,229 **** - #include - #define issjis1(c) iskanji(c) - #else -! #define LPRCOMMAND "/usr/ucb/lpr -Plipsf" - #define PATHDELIM '/' - #define NULLDEVICE "/dev/null" - #define LIPSF "lipsf" ---- 223,229 ---- - #include - #define issjis1(c) iskanji(c) - #else -! #define LPRCOMMAND "/usr/bin/lpr -Plipsf" - #define PATHDELIM '/' - #define NULLDEVICE "/dev/null" - #define LIPSF "lipsf" -*** machine.h.orig Mon Dec 9 21:34:54 1996 ---- machine.h Mon Dec 9 21:36:28 1996 -*************** -*** 343,348 **** ---- 343,355 ---- - # define USEFFSIZE - # endif - #endif -+ #if defined(__FreeBSD__) || defined(__NetBSD__) -+ #define LANG ja -+ #define ICMD install -+ #define IBINFLG "-c -s -o bin -g bin" -+ #define IMANFLG "-c -o bin -g bin" -+ #endif -+ - - #if defined (__bsdi__) - #define BSD43 -*** mkmfsed.c.orig Mon Dec 9 21:36:42 1996 ---- mkmfsed.c Mon Dec 9 21:40:01 1996 -*************** -*** 21,26 **** ---- 21,31 ---- - - #ifdef CODEEUC - s:__KCODEOPTION__:-e: -+ #ifdef LANG -+ s:__LANG__:LANG: -+ #else -+ s:__LANG__:: -+ #endif - #else - s:__KCODEOPTION__:-s: - #endif -*************** -*** 29,32 **** ---- 34,52 ---- - s:__MSBOPTION__:-7: - #else - s:__MSBOPTION__:: -+ #endif -+ #ifdef ICMD -+ s:__ICMD__:ICMD: -+ #else -+ s:__ICMD__:cp: -+ #endif -+ #ifdef IBINFLG -+ s:__IBINFLG__:IBINFLG: -+ #else -+ s:__IBINFLG__:-p: -+ #endif -+ #ifdef IMANFLG -+ s:__IMANFLG__:IMANFLG: -+ #else -+ s:__IMANFLG__:-p: - #endif diff -urN /usr/ports/japanese/lipsf/patches/patch-ab japanese/lipsf/patches/patch-ab --- /usr/ports/japanese/lipsf/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ japanese/lipsf/patches/patch-ab Wed Jan 12 21:49:36 2000 @@ -0,0 +1,13 @@ +--- Makefile.orig Fri Nov 5 00:00:15 1999 ++++ Makefile Wed Jan 12 21:49:27 2000 +@@ -3,8 +3,8 @@ + # + + SHELL = /bin/sh +-MAKE = make +-CC = cc ++MAKE ?= make ++CC ?= cc + SED = sed + + all: Makefile.tmp diff -urN /usr/ports/japanese/lipsf/patches/patch-ac japanese/lipsf/patches/patch-ac --- /usr/ports/japanese/lipsf/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ japanese/lipsf/patches/patch-ac Wed Jan 12 22:27:10 2000 @@ -0,0 +1,64 @@ +--- Makefile.in.orig Fri Nov 5 00:00:15 1999 ++++ Makefile.in Wed Jan 12 22:26:59 2000 +@@ -3,12 +3,15 @@ + # + + TITLE = lipsf +-PREFIX = /usr/local ++PREFIX ?= /usr/local + TOPDIR = $(PREFIX) + BINDIR = $(TOPDIR)/bin +-MANDIR = $(TOPDIR)/man__LANGDIR__/man$(MANSEC) +-CATDIR = $(TOPDIR)/man__LANGDIR__/cat$(MANSEC) ++MANLANG ?= ja ++MANDIR = $(TOPDIR)/man/$(MANLANG)/man$(MANSEC) ++CATDIR = $(TOPDIR)/man/$(MANLANG)/cat$(MANSEC) + INSTALL = __INSTALL__ ++INSTALL_BIN = $(INSTALL) -o bin -g bin ++INSTALL_MAN = $(INSTALL) -o bin -g bin + CHMOD = chmod + MANSEC = 1 + +@@ -44,7 +47,7 @@ + POBJ2 = output__OBJ__ print__OBJ__ control__OBJ__ args__OBJ__ var__OBJ__ __DOSOBJS__ + KNJOBJ = pols__OBJ__ input__OBJ__ file__OBJ__ style__OBJ__ + LDFLAGS = __TERMLIBS__ __OTHERLIBS__ +-CFLAGS = -D__OSTYPE__ __CCOPTIONS__ ++CFLAGS += -D__OSTYPE__ #__CCOPTIONS__ + + .SUFFIXES: .h .c __OBJ__ __EXE__ + +@@ -116,25 +119,25 @@ + # to install all + + install: $(LIPSFB) $(POLSB) $(LIPSF).$(MANSEC) $(POLS).$(MANSEC) +- $(INSTALL) __INSTSTRIP__ $(LIPSFB) $(BINDIR) ++ $(INSTALL_BIN) __INSTSTRIP__ $(LIPSFB) $(BINDIR) + $(CHMOD) a+rx $(BINDIR)/$(LIPSFB) +- $(INSTALL) __INSTSTRIP__ $(POLSB) $(BINDIR) ++ $(INSTALL_BIN) __INSTSTRIP__ $(POLSB) $(BINDIR) + $(CHMOD) a+rx $(BINDIR)/$(POLSB) +- $(INSTALL) $(LIPSF).$(MANSEC) $(MANDIR)/$(LIPSF).$(MANSEC) ++ $(INSTALL_MAN) $(LIPSF).$(MANSEC) $(MANDIR)/$(LIPSF).$(MANSEC) + $(CHMOD) a+r $(MANDIR)/$(LIPSFB).$(MANSEC) +- $(INSTALL) $(POLS).$(MANSEC) $(MANDIR)/$(POLS).$(MANSEC) ++ $(INSTALL_MAN) $(POLS).$(MANSEC) $(MANDIR)/$(POLS).$(MANSEC) + $(CHMOD) a+r $(MANDIR)/$(POLSB).$(MANSEC) + + catman: $(LIPSF).$(MANSEC)c $(POLS).$(MANSEC)c +- $(INSTALL) $(LIPSF).$(MANSEC)c $(CATDIR)/$(LIPSF).$(MANSEC) ++ $(INSTALL_MAN) $(LIPSF).$(MANSEC)c $(CATDIR)/$(LIPSF).$(MANSEC) + $(CHMOD) a+r $(CATDIR)/$(LIPSF).$(MANSEC) +- $(INSTALL) $(POLS).$(MANSEC)c $(CATDIR)/$(POLS).$(MANSEC) ++ $(INSTALL_MAN) $(POLS).$(MANSEC)c $(CATDIR)/$(POLS).$(MANSEC) + $(CHMOD) a+r $(CATDIR)/$(POLS).$(MANSEC) + + catman-b: $(LIPSF).doc $(POLS).doc +- $(INSTALL) $(LIPSF).doc $(CATDIR)/$(LIPSF).$(MANSEC) ++ $(INSTALL_MAN) $(LIPSF).doc $(CATDIR)/$(LIPSF).$(MANSEC) + $(CHMOD) a+r $(CATDIR)/$(LIPSF).$(MANSEC) +- $(INSTALL) $(POLS).doc $(CATDIR)/$(POLS).$(MANSEC) ++ $(INSTALL_MAN) $(POLS).doc $(CATDIR)/$(POLS).$(MANSEC) + $(CHMOD) a+r $(CATDIR)/$(POLS).$(MANSEC) + + compman: catman >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message