Stop RUN_DEPEND to X, make BUILD_DEPEND only,

and some portlint check.
Submitted by:	MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>

6 files changed, 75 insertions, 63 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index f470d02b0b63..b0cd96b5c058 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
+# $Id: Makefile,v 1.23 1998/11/14 09:43:14 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -14,10 +14,9 @@ MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
-USE_IMAKE=	yes
-PREFIX?=	${LOCALBASE}
-ALL_TARGET=	canna
+BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
+ALL_TARGET=	canna
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
 	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
@@ -29,12 +28,19 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MANCOMPRESSED=	no
+MANCOMPRESSED=	yes
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.SILENT:
+
 .include <bsd.port.pre.mk>
 
+do-configure:
+	@(cd ${WRKSRC}; ${XMKMF})
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
@@ -47,22 +53,10 @@ post-install:
 	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
-		echo '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
-		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
-		  >> ${STARTUP_SCRIPT} ;				\
-		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
-		echo '    mkdir -p /var/run/canna' >> ${STARTUP_SCRIPT};\
-		echo '    touch /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo '    chown bin:bin /var/run/canna /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
-		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
-		echo "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/japanese/Canna/files/canna.sh.in b/japanese/Canna/files/canna.sh.in
new file mode 100644
index 000000000000..beab506bd53a
--- /dev/null
+++ b/japanese/Canna/files/canna.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+canna=@PREFIX@/sbin/cannaserver
+if [ -f $canna ]; then
+	rm -f /var/run/canna/Canna.pid
+	mkdir -p /var/run/canna
+	touch /var/log/CANNA0msgs
+	chown bin:bin /var/run/canna /var/log/CANNA0msgs
+	echo -n ' Canna'
+	$canna
+fi
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index f470d02b0b63..b0cd96b5c058 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
+# $Id: Makefile,v 1.23 1998/11/14 09:43:14 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -14,10 +14,9 @@ MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
-USE_IMAKE=	yes
-PREFIX?=	${LOCALBASE}
-ALL_TARGET=	canna
+BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
+ALL_TARGET=	canna
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
 	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
@@ -29,12 +28,19 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MANCOMPRESSED=	no
+MANCOMPRESSED=	yes
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.SILENT:
+
 .include <bsd.port.pre.mk>
 
+do-configure:
+	@(cd ${WRKSRC}; ${XMKMF})
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
@@ -47,22 +53,10 @@ post-install:
 	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
-		echo '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
-		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
-		  >> ${STARTUP_SCRIPT} ;				\
-		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
-		echo '    mkdir -p /var/run/canna' >> ${STARTUP_SCRIPT};\
-		echo '    touch /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo '    chown bin:bin /var/run/canna /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
-		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
-		echo "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/japanese/canna-lib/files/canna.sh.in b/japanese/canna-lib/files/canna.sh.in
new file mode 100644
index 000000000000..beab506bd53a
--- /dev/null
+++ b/japanese/canna-lib/files/canna.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+canna=@PREFIX@/sbin/cannaserver
+if [ -f $canna ]; then
+	rm -f /var/run/canna/Canna.pid
+	mkdir -p /var/run/canna
+	touch /var/log/CANNA0msgs
+	chown bin:bin /var/run/canna /var/log/CANNA0msgs
+	echo -n ' Canna'
+	$canna
+fi
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index f470d02b0b63..b0cd96b5c058 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -4,7 +4,7 @@
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.22 1998/10/10 15:27:26 kuriyama Exp $
+# $Id: Makefile,v 1.23 1998/11/14 09:43:14 asami Exp $
 #
 
 DISTNAME=	Canna32p2
@@ -14,10 +14,9 @@ MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
 
 MAINTAINER=	max@FreeBSD.ORG
 
-USE_IMAKE=	yes
-PREFIX?=	${LOCALBASE}
-ALL_TARGET=	canna
+BUILD_DEPENDS=	imake:${PORTSDIR}/x11/XFree86
 
+ALL_TARGET=	canna
 MAN1=	addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
 	canvert.1 catdic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
 	dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
@@ -29,12 +28,19 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
 	RkMapPhonogram.3 RkMapRoma.3 RkMountD.3 RkNext.3 RkNfer.3 \
 	RkOpenRoma.3 RkPrev.3 RkRemountDic.3 RkResize.3 RkRgnBun.3 RkRight.3 \
 	RkShorten.3 RkStoreYomi.3 RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MANCOMPRESSED=	no
+MANCOMPRESSED=	yes
 
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/canna.sh
 
+.SILENT:
+
 .include <bsd.port.pre.mk>
 
+do-configure:
+	@(cd ${WRKSRC}; ${XMKMF})
+	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
+		>${WRKDIR}/canna.sh
+
 pre-install:
 	${MKDIR} /var/run/canna
 	chown bin.bin /var/run/canna
@@ -47,22 +53,10 @@ post-install:
 	${LN} -sf libcanna16.so.1.0 ${PREFIX}/lib/libcanna16.so
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
-		echo "Installing ${STARTUP_SCRIPT} startup file."; 	\
-		echo '#!/bin/sh' > ${STARTUP_SCRIPT}; 			\
-		echo 'canna=${PREFIX}/sbin/cannaserver' 		\
-		  >> ${STARTUP_SCRIPT} ;				\
-		echo 'if [ -f $$canna ]; then' >> ${STARTUP_SCRIPT} ;	\
-		echo '    rm -f /var/run/canna/Canna.pid' >> ${STARTUP_SCRIPT};\
-		echo '    mkdir -p /var/run/canna' >> ${STARTUP_SCRIPT};\
-		echo '    touch /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo '    chown bin:bin /var/run/canna /var/log/CANNA0msgs' >> ${STARTUP_SCRIPT};\
-		echo "    echo -n ' Canna'" >> ${STARTUP_SCRIPT};	\
-		echo '     $$canna' >> ${STARTUP_SCRIPT} ;		\
-		echo "fi" >> ${STARTUP_SCRIPT} ;			\
-		chmod 755 ${STARTUP_SCRIPT} ;				\
-		chown bin.bin ${STARTUP_SCRIPT};			\
+	if [ ! -f ${STARTUP_SCRIPT} ]; then 				\
+		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; 	\
+		${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT};	\
 	fi
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
new file mode 100644
index 000000000000..beab506bd53a
--- /dev/null
+++ b/japanese/canna-server/files/canna.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+canna=@PREFIX@/sbin/cannaserver
+if [ -f $canna ]; then
+	rm -f /var/run/canna/Canna.pid
+	mkdir -p /var/run/canna
+	touch /var/log/CANNA0msgs
+	chown bin:bin /var/run/canna /var/log/CANNA0msgs
+	echo -n ' Canna'
+	$canna
+fi