3 files changed, 15 insertions, 33 deletions

diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile
index 37c8190a9b2a..30dafe218b4e 100644
--- a/japanese/cdrom2/Makefile
+++ b/japanese/cdrom2/Makefile
@@ -9,28 +9,28 @@ MASTER_SITES=	http://www.nerimadors.or.jp/~jiro/cdrom2/
 DISTNAME=	euc
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool to lookup CD-ROM dictionaries
+COMMENT=	Tool to lookup CD-ROM dictionaries
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
-DOCS=		errata.doc gaiji.txt index.doc install.doc kekka.txt \
+
+PLIST_FILES=	bin/cdgaiji bin/cdrom2 lib/cdrom2/kojien3.tbl \
+		lib/cdrom2/ruigo.tbl
+PLIST_DIRS=	lib/cdrom2
+PORTDOCS=	errata.doc gaiji.txt index.doc install.doc kekka.txt \
 		kojien3.doc menu.doc readers.doc readme.doc readme.org \
 		ruigo.doc x_option.doc
 
 SUB_FILES+=	pkg-message
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-configure:
 	@${ECHO_MSG} "Copying custom Makefile."
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-.if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
-.endfor
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/cdrom2/files/Makefile b/japanese/cdrom2/files/Makefile
index c1b4e7165173..f0b5939f0293 100644
--- a/japanese/cdrom2/files/Makefile
+++ b/japanese/cdrom2/files/Makefile
@@ -11,18 +11,18 @@ TBL_FILES=kojien3.tbl ruigo.tbl
 all: ${PROGRAMS}
 
 cdrom2: cdrom2.c
-	cc -DUNIX -O -o cdrom2 cdrom2.c
+	cc -DUNIX ${CFLAGS} -o cdrom2 cdrom2.c
 
 cdgaiji: cdgaiji.c
-	cc -DUNIX -O -o cdgaiji cdgaiji.c
+	cc -DUNIX ${CFLAGS} -o cdgaiji cdgaiji.c
 
 install:
 	for f in ${PROGRAMS} ; do \
-	  /usr/bin/install -c -s -o bin -g bin -m 755 $$f ${BINDIR} ;\
+	  ${BSD_INSTALL_PROGRAM} $$f ${DESTDIR}${BINDIR} ;\
 	done
-	/bin/mkdir -p ${LIBDIR}
+	/bin/mkdir -p ${DESTDIR}${LIBDIR}
 	for f in ${TBL_FILES} ; do \
-	  /usr/bin/install -c -o bin -g bin -m 644 $$f ${LIBDIR} ;\
+	  ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR} ;\
 	done	
 
 clean:
diff --git a/japanese/cdrom2/pkg-plist b/japanese/cdrom2/pkg-plist
deleted file mode 100644
index d7a432c9dade..000000000000
--- a/japanese/cdrom2/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/cdgaiji
-bin/cdrom2
-lib/cdrom2/kojien3.tbl
-lib/cdrom2/ruigo.tbl
-%%PORTDOCS%%%%DOCSDIR%%/errata.doc
-%%PORTDOCS%%%%DOCSDIR%%/gaiji.txt
-%%PORTDOCS%%%%DOCSDIR%%/index.doc
-%%PORTDOCS%%%%DOCSDIR%%/install.doc
-%%PORTDOCS%%%%DOCSDIR%%/kekka.txt
-%%PORTDOCS%%%%DOCSDIR%%/kojien3.doc
-%%PORTDOCS%%%%DOCSDIR%%/menu.doc
-%%PORTDOCS%%%%DOCSDIR%%/readers.doc
-%%PORTDOCS%%%%DOCSDIR%%/readme.doc
-%%PORTDOCS%%%%DOCSDIR%%/readme.org
-%%PORTDOCS%%%%DOCSDIR%%/ruigo.doc
-%%PORTDOCS%%%%DOCSDIR%%/x_option.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/cdrom2