Updated to 1.14a

PR:		16108
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
Approved by:	maintainer

4 files changed, 91 insertions, 14 deletions

diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile
index 797d95450c4b..da8f50edfb4e 100644
--- a/japanese/lipsf/Makefile
+++ b/japanese/lipsf/Makefile
@@ -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 <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-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 <bsd.port.mk>
diff --git a/japanese/lipsf/distinfo b/japanese/lipsf/distinfo
index 4ad77e6d3475..4d053a769bbb 100644
--- a/japanese/lipsf/distinfo
+++ b/japanese/lipsf/distinfo
@@ -1,2 +1 @@
-MD5 (lipsf113.tar.gz) = b3351eb8ed91a65541d38daae4b8e9c7
-MD5 (lipsf113c.patch.gz) = ff92a2fe677d9d743b41f12d313048fb
+MD5 (lpsf114a.tgz) = e74daeea4ef8dad0b87b1bd33a20edc8
diff --git a/japanese/lipsf/files/patch-ab b/japanese/lipsf/files/patch-ab
new file mode 100644
index 000000000000..23d2dc194e24
--- /dev/null
+++ b/japanese/lipsf/files/patch-ab
@@ -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 --git a/japanese/lipsf/files/patch-ac b/japanese/lipsf/files/patch-ac
new file mode 100644
index 000000000000..b98df976494d
--- /dev/null
+++ b/japanese/lipsf/files/patch-ac
@@ -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