- Stagify; define LICENSE (GPLv2); add missing OPTIONS_DEFINE for DOCS

- Contract MASTER_SITES and use SFJP abbreviation (makes it nice and short)
- One of the docfiles lives in its own subdirectory; link it relative to
  ${WRKSRC} to simplify installation routine (install all files at once)
- Convert pkg-plist info PLIST_FILES and PORTDOCS; remove attribution from
  the port description (original submitter mentioned in Makefile header)

3 files changed, 17 insertions, 34 deletions

diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index 209c483833e8..b722b25d0c7f 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -5,22 +5,27 @@ PORTNAME=	skkinput
 PORTVERSION=	2.06.4
 PORTREVISION=	2
 CATEGORIES=	japanese x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	skkinput2/6273
+MASTER_SITES=	SFJP/skkinput2/6273
 
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	SKK-like Japanese input method for X11
 
+LICENSE=	GPLv2
+
 USES=		imake
 USE_XORG=	ice sm x11 xext xt xmu
 
-OPTIONS_RADIO=	RG1
-OPTIONS_RADIO_RG1=	DBSKKD RSKKSERV
-RG1_DESC=	Skkserver Selection
+PLIST_FILES=	bin/skkinput lib/X11/app-defaults/Skkinput \
+		man/ja/man1/skkinput.1.gz man/man1/skkinput.1.gz
+PORTDOCS=	*.jis ChangeLog skkinputlisp.doc dot.skkinput
+
+OPTIONS_DEFINE=	DOCS
+OPTIONS_RADIO=	SKKSERVER
+OPTIONS_RADIO_SKKSERVER=DBSKKD RSKKSERV
+SKKSERVER_DESC=	Skkserver selection
 DBSKKD_DESC=	Use ja-dbskkd-cdb as skkserver
 RSKKSERV_DESC=	Use ja-rskkserv as skkserver
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBSKKD}
@@ -31,17 +36,11 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
 .endif
 
-MANLANG=	"" ja
-MAN1=		skkinput.1
-MANCOMPRESSED=	yes
-
-DOCS=		*.jis ChangeLog \
-		myeval/skkinputlisp.doc dot.skkinput
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@( cd ${WRKSRC} ; ${INSTALL_DATA} ${DOCS} ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+# One of the docfiles lives in its own subdirectory; link it relative to
+# ${WRKSRC} to simplify installation routine (install all files at once)
+	@${LN} ${WRKSRC}/myeval/skkinputlisp.doc ${WRKSRC}/skkinputlisp.doc
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/skkinput/pkg-descr b/japanese/skkinput/pkg-descr
index ea1b78bea330..fc642558a526 100644
--- a/japanese/skkinput/pkg-descr
+++ b/japanese/skkinput/pkg-descr
@@ -3,10 +3,6 @@ text input.
 
 A client that wants kana-kanji conversion service for Japanese text
 sends a request to skkinput.  Skkinput receives the request, does
-kana-kanji conversion, and sends the converted text back to the
-client.
-
-The port was done by Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>.
-It requires skk server.
+kana-kanji conversion, and sends converted text back to the client.
 
 WWW: http://skkinput2.sourceforge.jp/
diff --git a/japanese/skkinput/pkg-plist b/japanese/skkinput/pkg-plist
deleted file mode 100644
index abea42101634..000000000000
--- a/japanese/skkinput/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/skkinput
-lib/X11/app-defaults/Skkinput
-%%PORTDOCS%%share/doc/skkinput/BUGS.jis
-%%PORTDOCS%%share/doc/skkinput/CHANGES.jis
-%%PORTDOCS%%share/doc/skkinput/ChangeLog
-%%PORTDOCS%%share/doc/skkinput/FAQ.jis
-%%PORTDOCS%%share/doc/skkinput/PROGRAM.jis
-%%PORTDOCS%%share/doc/skkinput/README.jis
-%%PORTDOCS%%share/doc/skkinput/TODO.jis
-%%PORTDOCS%%share/doc/skkinput/dot.skkinput
-%%PORTDOCS%%share/doc/skkinput/skkinputlisp.doc
-%%PORTDOCS%%@dirrm share/doc/skkinput