- Hand maintainership to submitter.

- Add patch to fix regular expression bug.
- Install data files in DATADIR.
- Move information about documentation and sample configuration
  from pkg-descr to pkg-message.
- Add license information.
- Add new DOCS option.
- Replace pkg-plist with PLIST_DIRS and PLIST_FILES.
- Support staging.
- Fix build on systems without gcc.

PR:		ports/182285
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

6 files changed, 55 insertions, 18 deletions

diff --git a/japanese/csrd/Makefile b/japanese/csrd/Makefile
index 1aec4282138a..e96d579960d4 100644
--- a/japanese/csrd/Makefile
+++ b/japanese/csrd/Makefile
@@ -3,21 +3,47 @@
 
 PORTNAME=	csrd
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/csrd/
 
-MAINTAINER=	ports@FreeBSD.org
+PATCH_SITES=	http://green.ribbon.to/~ikazuhiro/dic/files/
+PATCHFILES=	csrd.c.diff.gz
+
+MAINTAINER=	yasu@utahime.org
 COMMENT=	Utility for Shogakukan Random House English-Japanese Dictionary
 
+LICENSE=	PUBLIC_DOMAIN
+LICENSE_NAME=	Public Domain
+LICENSE_FILE=	${WRKSRC}/csrd.doc
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 MAKEFILE=	makefile.unx
+MAKE_ARGS=	CC="${CC}"
 ALL_TARGET=	csrd
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+PLIST_DIRS=	%%DATADIR%%
+PLIST_FILES=	bin/csrd %%DATADIR%%/csrd.fmt %%DATADIR%%/csrd.gai \
+		%%DATADIR%%/quiet.fmt %%DATADIR%%/quiet.gai
+
+PORTDOCS=	README csrd.doc
+
+SUB_FILES=	pkg-message
+
+.include <bsd.port.options.mk>
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/csrd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/csrd.fmt ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/csrd.gai ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/share/doc/${PKGNAME}
-	${INSTALL_DATA} ${WRKSRC}/csrd.doc ${PREFIX}/share/doc/${PKGNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/csrd ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/csrd.fmt ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/csrd.gai ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/quiet.fmt ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/quiet.gai ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/csrd/distinfo b/japanese/csrd/distinfo
index fcb258a62712..771c289b705d 100644
--- a/japanese/csrd/distinfo
+++ b/japanese/csrd/distinfo
@@ -1,2 +1,4 @@
 SHA256 (csrd-1.0.tar.gz) = 499c4f41e5f70e54e384972ba811ed9065402f440afb8328600dd1dd7335369a
 SIZE (csrd-1.0.tar.gz) = 44955
+SHA256 (csrd.c.diff.gz) = a3dfd3d6ad97ce3a2e5539d04c404f39ab9f5ecd275382e4e1fe92754a665250
+SIZE (csrd.c.diff.gz) = 277
diff --git a/japanese/csrd/files/patch-csrd.c b/japanese/csrd/files/patch-csrd.c
new file mode 100644
index 000000000000..fbc635187aa5
--- /dev/null
+++ b/japanese/csrd/files/patch-csrd.c
@@ -0,0 +1,11 @@
+--- csrd.c.orig	2013-10-20 17:18:39.000000000 +0900
++++ csrd.c	2013-10-20 17:21:09.000000000 +0900
+@@ -4111,7 +4111,7 @@
+ int
+ main(ac, av)
+ int	ac;
+-uchr	**av;
++char	**av;
+ {
+     signal(SIGINT, onintr);
+ #if defined(UNIX) && defined(RC_PATH)
diff --git a/japanese/csrd/files/pkg-message.in b/japanese/csrd/files/pkg-message.in
new file mode 100644
index 000000000000..cd64358d0df5
--- /dev/null
+++ b/japanese/csrd/files/pkg-message.in
@@ -0,0 +1,9 @@
+**********************************************************************
+If DOCS option is enabled then you can get more information from the
+following document (EUC-JP is used as file charset):
+
+%%DOCSDIR%%/csrd.doc
+
+[Example of %%PREFIX%%/etc/csrd.rc]
+-d /cdrom/data -f %%DATADIR%%/csrd.fmt -g %%DATADIR%%/csrd.gai
+**********************************************************************
diff --git a/japanese/csrd/pkg-descr b/japanese/csrd/pkg-descr
index 30a038c748bd..a6e2e1b626f4 100644
--- a/japanese/csrd/pkg-descr
+++ b/japanese/csrd/pkg-descr
@@ -1,10 +1,4 @@
 CSRD is a utility for Shogakukan Random House English-Japanese
 Dictionary on UNIX or MS-DOS box.
 
-You can get more information from the following document.
-${PREFIX}/share/doc/ja-csrd-1.0/csrd.doc
-
-[Example of ${PREFIX}/etc/csrd.rc]
--d/cdrom/data -f/usr/local/lib/csrd.fmt -g/usr/local/lib/csrd.gai
-
 WWW: http://openlab.ring.gr.jp/edict/
diff --git a/japanese/csrd/pkg-plist b/japanese/csrd/pkg-plist
deleted file mode 100644
index 12b71636b517..000000000000
--- a/japanese/csrd/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/csrd
-lib/csrd.fmt
-lib/csrd.gai
-share/doc/ja-csrd-1.0/csrd.doc
-@dirrm share/doc/ja-csrd-1.0