7 files changed, 96 insertions, 93 deletions

diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile
index 140439e4f925..850333a09306 100644
--- a/japanese/okphone/Makefile
+++ b/japanese/okphone/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 February 1996
 # Whom:			asami
 #
-# $Id: Makefile,v 1.10 1997/12/25 22:29:40 asami Exp $
+# $Id: Makefile,v 1.11 1998/08/10 12:10:07 steve Exp $
 #
 
 DISTNAME=	okphone-1.2
@@ -13,11 +13,20 @@ MASTER_SITES=	ftp://ftp.kyushu-u.ac.jp/pub/utils/
 
 PATCH_SITES=	ftp://ftp.fit.ac.jp/pub/Net/okphone/patch/
 PATCHFILES=	okphone-1.2.FreeBSD-patch.rev2.gz
-PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	max@FreeBSD.ORG
+
+PATCH_DIST_STRIP=	-p1
+MAN1=			phone.1
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/phone.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/okphone
+.for f in NOTE READ_ME Readme.kana
+	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/okphone
+.endfor
+.endif
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/okphone/files/patch-aa b/japanese/okphone/files/patch-aa
index 478146aff9de..7c9afc7d59f2 100644
--- a/japanese/okphone/files/patch-aa
+++ b/japanese/okphone/files/patch-aa
@@ -5,7 +5,7 @@
  
  CC	=	cc
 -CFLAGS	=	-O
-+CFLAGS	+=	
++CFLAGS	+=	-O
  SRCS	=	convd.c
  DEST	=	convd
 -RDEST	=	/usr/local/etc/convd
@@ -18,91 +18,7 @@
  install:	${DEST}
  	/bin/rm -f ${RDEST}
 -	cp ${DEST} ${RDEST}
-+	install -cs ${DEST} ${RDEST}
++	install -cs -m 755 -o bin -g bin ${DEST} ${RDEST}
  
  clean:
  	/bin/rm -f ${DEST} core *.o
---- ./client/Makefile.org	Wed Feb  7 18:45:34 1996
-+++ ./client/Makefile	Wed Feb  7 18:45:36 1996
-@@ -20,14 +20,14 @@
- CC     = cc
- #CFLAGS = -O -DSERVICES -DLOCAL_ECHO
- #CFLAGS = -g -DSERVICES -DLOCAL_ECHO
--CFLAGS = -Isw -O -DSERVICES -DLOCAL_ECHO
-+CFLAGS += -Isw -DSERVICES -DLOCAL_ECHO
- #LIBS   = -lcurses -ltermlib #-lresolv
- LIBS   = sw/libsw.a -ltermlib -ll
- 
- LPR    = lpr -Psony
- #RDEST  = /usr/ucb/phone
- #RDEST  = /usr/local/phone
--RDEST  = /usr/local/bin/phone
-+RDEST  = ${PREFIX}/bin/phone
- 
- HDRS = defs.h
- 
-@@ -69,7 +69,7 @@
- 
- install: ${DEST}
- 	/bin/rm -f ${RDEST}
--	cp ${DEST} ${RDEST}
-+	install -cs ${DEST} ${RDEST}
- 
- print:	${HDRS} ${SRCS}
- 	pr -f ${HDRS} ${SRCS} | expand -4 | ${LPR}
---- ./master/Makefile.org	Wed Feb  7 18:45:36 1996
-+++ ./master/Makefile	Wed Feb  7 18:45:36 1996
-@@ -29,7 +29,7 @@
- #CFLAGS = -O -DSERVICES -DDPATH=\"$(CONVD)\" -DFORK
- #CFLAGS = -O -DINETD -DDPATH=\"$(CONVD)\"
- #CFLAGS = -O -DINETD -DDPATH=\"$(CONVD)\" -DSERVICES
--CFLAGS  = $(OFLAG) $(INETD) -DFORK -DSERVICES -DDPATH=\"/usr/local/etc/convd\"
-+CFLAGS  += $(INETD) -DFORK -DSERVICES -DDPATH=\"${PREFIX}/libexec/convd\"
- 
- LPR     = lpr -Psony
- CC	= cc
-@@ -44,7 +44,7 @@
- 			reinvite.o strsave.o utmp.o
- 
- DEST	= phoned
--RDEST	= /usr/local/etc/in.phoned
-+RDEST	= ${PREFIX}/libexec/phoned
- #RDEST	= /etc/phoned
- 
- 
-@@ -61,7 +61,7 @@
- 
- install:	${DEST}
- 	/bin/rm -f ${RDEST}
--	cp ${DEST} ${RDEST}
-+	install -cs ${DEST} ${RDEST}
- 
- clean:
- 	/bin/rm -f ${DEST} core *.o
---- ./Makefile.org	Fri Dec 15 01:30:07 1989
-+++ ./Makefile	Wed Feb  7 20:39:53 1996
-@@ -13,3 +13,13 @@
- 	done
- 
- default: all	
-+
-+install:
-+	/bin/rm -f ${PREFIX}/man/man1/phone.1*
-+	install -c phone.1 ${PREFIX}/man/man1
-+	gzip -9nf ${PREFIX}/man/man1/phone.1
-+	mkdir -p ${PREFIX}/share/okphone
-+	install -c NOTE READ_ME Readme.kana ${PREFIX}/share/okphone
-+	for i in ${DIRS} ; do \
-+		cd $$i ; make MFLAGS="${MFLAGS}" $@ ; cd .. ; \
-+	done
---- ./client/sw/Makefile.org	Fri Dec 15 01:30:11 1989
-+++ ./client/sw/Makefile	Wed Feb  7 20:57:50 1996
-@@ -1,7 +1,7 @@
- # $Header: /home/ncvs/ports/japanese/okphone/patches/patch-aa,v 1.2 1996/02/08 05:01:24 asami Exp $
- 
- #CFLAGS= -g -pg
--CFLAGS= -O
-+CFLAGS+=
- objs= winit.o wcreate.o woutput.o wredraw.o wput.o wclear.o wbox.o wbell.o\
- 	tosjis.o
- srcs= winit.c wcreate.c woutput.c wredraw.c wput.c wclear.c wbox.c wbell.c\
diff --git a/japanese/okphone/files/patch-ab b/japanese/okphone/files/patch-ab
new file mode 100644
index 000000000000..244c705bc97b
--- /dev/null
+++ b/japanese/okphone/files/patch-ab
@@ -0,0 +1,28 @@
+--- ./client/Makefile.org	Wed Feb  7 18:45:34 1996
++++ ./client/Makefile	Wed Feb  7 18:45:36 1996
+@@ -20,14 +20,14 @@
+ CC     = cc
+ #CFLAGS = -O -DSERVICES -DLOCAL_ECHO
+ #CFLAGS = -g -DSERVICES -DLOCAL_ECHO
+-CFLAGS = -Isw -O -DSERVICES -DLOCAL_ECHO
++CFLAGS += -Isw -O -DSERVICES -DLOCAL_ECHO
+ #LIBS   = -lcurses -ltermlib #-lresolv
+ LIBS   = sw/libsw.a -ltermlib -ll
+ 
+ LPR    = lpr -Psony
+ #RDEST  = /usr/ucb/phone
+ #RDEST  = /usr/local/phone
+-RDEST  = /usr/local/bin/phone
++RDEST  = ${PREFIX}/bin/phone
+ 
+ HDRS = defs.h
+ 
+@@ -69,7 +69,7 @@
+ 
+ install: ${DEST}
+ 	/bin/rm -f ${RDEST}
+-	cp ${DEST} ${RDEST}
++	install -cs -m 755 -o bin -g bin ${DEST} ${RDEST}
+ 
+ print:	${HDRS} ${SRCS}
+ 	pr -f ${HDRS} ${SRCS} | expand -4 | ${LPR}
diff --git a/japanese/okphone/files/patch-ac b/japanese/okphone/files/patch-ac
new file mode 100644
index 000000000000..6f922dfb3a41
--- /dev/null
+++ b/japanese/okphone/files/patch-ac
@@ -0,0 +1,29 @@
+--- ./master/Makefile.org	Wed Feb  7 18:45:36 1996
++++ ./master/Makefile	Wed Feb  7 18:45:36 1996
+@@ -29,7 +29,7 @@
+ #CFLAGS = -O -DSERVICES -DDPATH=\"$(CONVD)\" -DFORK
+ #CFLAGS = -O -DINETD -DDPATH=\"$(CONVD)\"
+ #CFLAGS = -O -DINETD -DDPATH=\"$(CONVD)\" -DSERVICES
+-CFLAGS  = $(OFLAG) $(INETD) -DFORK -DSERVICES -DDPATH=\"/usr/local/etc/convd\"
++CFLAGS  += $(OFLAGS) $(INETD) -DFORK -DSERVICES -DDPATH=\"${PREFIX}/libexec/convd\"
+ 
+ LPR     = lpr -Psony
+ CC	= cc
+@@ -44,7 +44,7 @@
+ 			reinvite.o strsave.o utmp.o
+ 
+ DEST	= phoned
+-RDEST	= /usr/local/etc/in.phoned
++RDEST	= ${PREFIX}/libexec/phoned
+ #RDEST	= /etc/phoned
+ 
+ 
+@@ -61,7 +61,7 @@
+ 
+ install:	${DEST}
+ 	/bin/rm -f ${RDEST}
+-	cp ${DEST} ${RDEST}
++	install -cs -m 755 -o bin -g bin ${DEST} ${RDEST}
+ 
+ clean:
+ 	/bin/rm -f ${DEST} core *.o
diff --git a/japanese/okphone/files/patch-ad b/japanese/okphone/files/patch-ad
new file mode 100644
index 000000000000..b0408bbb2e6c
--- /dev/null
+++ b/japanese/okphone/files/patch-ad
@@ -0,0 +1,11 @@
+--- ./Makefile.org	Fri Dec 15 01:30:07 1989
++++ ./Makefile	Wed Feb  7 20:39:53 1996
+@@ -13,3 +13,8 @@
+ 	done
+ 
+ default: all	
++
++install:
++	for i in ${DIRS} ; do \
++		cd $$i ; make MFLAGS="${MFLAGS}" $@ ; cd .. ; \
++	done
diff --git a/japanese/okphone/files/patch-ae b/japanese/okphone/files/patch-ae
new file mode 100644
index 000000000000..0790fdbf8145
--- /dev/null
+++ b/japanese/okphone/files/patch-ae
@@ -0,0 +1,11 @@
+--- ./client/sw/Makefile.org	Fri Dec 15 01:30:11 1989
++++ ./client/sw/Makefile	Wed Feb  7 20:57:50 1996
+@@ -1,7 +1,7 @@
+ # $Header: /home/ncvs/ports/japanese/okphone/patches/patch-aa,v 1.3 1996/02/08 06:27:36 asami Exp $
+ 
+ #CFLAGS= -g -pg
+-CFLAGS= -O
++CFLAGS+= -O
+ objs= winit.o wcreate.o woutput.o wredraw.o wput.o wclear.o wbox.o wbell.o\
+ 	tosjis.o
+ srcs= winit.c wcreate.c woutput.c wredraw.c wput.c wclear.c wbox.c wbell.c\
diff --git a/japanese/okphone/pkg-plist b/japanese/okphone/pkg-plist
index fc4879643a06..9ecf15447400 100644
--- a/japanese/okphone/pkg-plist
+++ b/japanese/okphone/pkg-plist
@@ -1,7 +1,6 @@
 bin/phone
-man/man1/phone.1.gz
 libexec/phoned
 libexec/convd
-share/okphone/NOTE
-share/okphone/READ_ME
-share/okphone/Readme.kana
+share/doc/okphone/NOTE
+share/doc/okphone/READ_ME
+share/doc/okphone/Readme.kana