5 files changed, 32 insertions, 47 deletions

diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile
index 1685dc571426..654cae441241 100644
--- a/japanese/lipsf/Makefile
+++ b/japanese/lipsf/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	lipsf
-PORTVERSION=	1.14a
+PORTVERSION=	1.14b
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/writing/print/
-EXTRACT_SUFX=	.tgz
-DISTNAME=	lpsf${PORTVERSION:S/.//}
+MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/lipsf/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
@@ -21,9 +20,9 @@ MAN1=		lipsf.1 pols.1
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/lipsf
+	@${MKDIR} ${DOCSDIR}
 .for file in HISTORY Install README TECHKNOW
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/lipsf
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/lipsf/distinfo b/japanese/lipsf/distinfo
index 4d053a769bbb..122fcdcc28f4 100644
--- a/japanese/lipsf/distinfo
+++ b/japanese/lipsf/distinfo
@@ -1 +1 @@
-MD5 (lpsf114a.tgz) = e74daeea4ef8dad0b87b1bd33a20edc8
+MD5 (lipsf114b.tar.gz) = 2ddb8229aa91cde365ac4c7fd8022017
diff --git a/japanese/lipsf/files/patch-ac b/japanese/lipsf/files/patch-ac
index b98df976494d..fefe302d7174 100644
--- a/japanese/lipsf/files/patch-ac
+++ b/japanese/lipsf/files/patch-ac
@@ -1,64 +1,48 @@
---- Makefile.in.orig	Fri Nov  5 00:00:15 1999
-+++ Makefile.in	Wed Jan 12 22:26:59 2000
-@@ -3,12 +3,15 @@
+--- Makefile.in.orig	Sat Nov 18 00:00:00 2000
++++ Makefile.in	Thu Apr  5 04:47:50 2001
+@@ -3,13 +3,13 @@
  #
  
  TITLE	= lipsf
 -PREFIX	= /usr/local
 +PREFIX	?= /usr/local
++MANLANG	?= ja
+ MANSEC	= 1
  TOPDIR	= $(PREFIX)
  BINDIR	= $(TOPDIR)/bin
 -MANDIR	= $(TOPDIR)/man__LANGDIR__/man$(MANSEC)
 -CATDIR	= $(TOPDIR)/man__LANGDIR__/cat$(MANSEC)
-+MANLANG	?= ja
+-INSTALL	= __INSTALL__
 +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 @@
+ LSRC	= lipsf.c output.c print.c control.c args.c var.c
+@@ -43,7 +43,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__
++CFLAGS	+= -D__OSTYPE__
  
  .SUFFIXES: .h .c __OBJ__ __EXE__
  
-@@ -116,25 +119,25 @@
+@@ -115,14 +115,10 @@
  # to install all
  
  install: $(LIPSFB) $(POLSB) $(LIPSF).$(MANSEC) $(POLS).$(MANSEC)
 -	$(INSTALL) __INSTSTRIP__ $(LIPSFB) $(BINDIR)
-+	$(INSTALL_BIN) __INSTSTRIP__ $(LIPSFB) $(BINDIR)
- 	$(CHMOD) a+rx $(BINDIR)/$(LIPSFB)
+-	$(CHMOD) a+rx $(BINDIR)/$(LIPSFB)
 -	$(INSTALL) __INSTSTRIP__ $(POLSB) $(BINDIR)
-+	$(INSTALL_BIN) __INSTSTRIP__ $(POLSB) $(BINDIR)
- 	$(CHMOD) a+rx $(BINDIR)/$(POLSB)
+-	$(CHMOD) a+rx $(BINDIR)/$(POLSB)
 -	$(INSTALL) $(LIPSF).$(MANSEC) $(MANDIR)/$(LIPSF).$(MANSEC)
-+	$(INSTALL_MAN) $(LIPSF).$(MANSEC) $(MANDIR)/$(LIPSF).$(MANSEC)
- 	$(CHMOD) a+r $(MANDIR)/$(LIPSFB).$(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)
+-	$(CHMOD) a+r $(MANDIR)/$(POLSB).$(MANSEC)
++	${BSD_INSTALL_PROGRAM} $(LIPSFB) $(BINDIR)
++	${BSD_INSTALL_PROGRAM} $(POLSB) $(BINDIR)
++	${BSD_INSTALL_MAN} $(LIPSF).$(MANSEC) $(MANDIR)/$(LIPSF).$(MANSEC)
++	${BSD_INSTALL_MAN} $(POLS).$(MANSEC) $(MANDIR)/$(POLS).$(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
+ 	$(INSTALL) $(LIPSF).$(MANSEC)c $(CATDIR)/$(LIPSF).$(MANSEC)
diff --git a/japanese/lipsf/pkg-descr b/japanese/lipsf/pkg-descr
index baac1fc16eab..f676eba1a5aa 100644
--- a/japanese/lipsf/pkg-descr
+++ b/japanese/lipsf/pkg-descr
@@ -10,3 +10,5 @@ Put lipsf entry to /etc/printcap file:
 
 lipsf|lipsf printer:\
 	:lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:sh:
+
+WWW: http://hp.vector.co.jp/authors/VA012337/soft/lipsf/
diff --git a/japanese/lipsf/pkg-plist b/japanese/lipsf/pkg-plist
index 28378bb22532..10ab761eec87 100644
--- a/japanese/lipsf/pkg-plist
+++ b/japanese/lipsf/pkg-plist
@@ -1,7 +1,7 @@
 bin/lipsf
 bin/pols
-share/doc/lipsf/HISTORY
-share/doc/lipsf/Install
-share/doc/lipsf/README
-share/doc/lipsf/TECHKNOW
-@dirrm share/doc/lipsf
+%%PORTDOCS%%share/doc/lipsf/HISTORY
+%%PORTDOCS%%share/doc/lipsf/Install
+%%PORTDOCS%%share/doc/lipsf/README
+%%PORTDOCS%%share/doc/lipsf/TECHKNOW
+%%PORTDOCS%%@dirrm share/doc/lipsf