Index: head/irc/keitairc/Makefile
===================================================================
--- head/irc/keitairc/Makefile	(revision 148092)
+++ head/irc/keitairc/Makefile	(revision 148093)
@@ -1,39 +1,47 @@
 # New ports collection makefile for:	keitairc
 # Date created:		11 Nov 2005
 # Whom:			Makoto Matsushita <matusita@FreeBSD.ORG>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	keitairc
 PORTVERSION=	1.29
 CATEGORIES=	irc
 MASTER_SITES=	http://keitairc.sourceforge.jp/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	#empty
 
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=IRC proxy for mobilephone that have a web interface
 
-RUN_DEPENDS=	${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \
+RUN_DEPENDS=	${JCODE}:${PORTSDIR}/japanese/p5-Jcode \
 		${SITE_PERL}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC \
 		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/HTTP/Response.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
 
 PLIST_FILES=	bin/keitairc
 
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
 USE_REINPLACE=	YES
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 
 do-patch:
 	${REINPLACE_CMD} -e "s,^#!/usr/bin/perl$$,#!${PERL}," ${WRKSRC}/keitairc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/keitairc ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/irc/keitairc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/japanese/eijiro-fpw/Makefile
===================================================================
--- head/japanese/eijiro-fpw/Makefile	(revision 148092)
+++ head/japanese/eijiro-fpw/Makefile	(revision 148093)
@@ -1,75 +1,82 @@
 # New ports collection makefile for:	EIJIRO Dictionary - JIS X 4081 version
 # Date created:        	2000.11.28
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	eijiro-fpw
 PORTVERSION=	1.0b
 PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EIJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/eijiro-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
 SRCFILE?=	eijiro52.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 .include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 
 CDROM_PATH:=	${DICT_PATH}
 DICT_PATH:=	${WRKDIR}
 .else
 CDROM_PATH=	${NONEXISTENT}
 .endif
 
 MAKE_ARGS:=	SRCFILE=${DICT_PATH}/${SRCFILE}
 
 post-extract:
 	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
 	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
 	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Eijiro Dictionary file with the full path"; \
 	  ${ECHO} "and excecute the following command again:"; \
 	  ${ECHO} "  make DICT_PATH=${DICT_PATH} SRCFILE=${SRCFILE}"; \
 	  ${ECHO} ""; \
 	  ${ECHO} "Notice: DICT_PATH must be a full path to the file."; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
 	${CP} ${LOCALBASE}/share/freepwing/fpwutils.mk ${WRKSRC}
 
 post-build:
 	cd ${WRKSRC}; ${CP} catalogs.sjis catalogs.txt; \
 	${SETENV} CATDUMPFLAGS="-e sjis" fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
 	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/eijiro-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in readme.sjis
 	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/eijiro-fpw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/japanese/kcode/Makefile
===================================================================
--- head/japanese/kcode/Makefile	(revision 148092)
+++ head/japanese/kcode/Makefile	(revision 148093)
@@ -1,46 +1,48 @@
 # New ports collection makefile for:	kcode
 # Date created:		26 October 2004
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kcode
 PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.irori.org/dl/tool/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.gz
 EXTRACT_ONLY=	${DISTFILES}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A handy utility to show codepoint information of given characters
 
 RUN_DEPENDS=	${_RUN_DEPENDS}
 
 USE_PERL5=	yes
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 MANLANG=	ja
 MAN1=		kcode.1
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
 IGNORE=		This port requires perl 5.6.0 or later
 .elif ${PERL_LEVEL} < 500800
 _RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+else
+_RUN_DEPENDS=	${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 .endif
 
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} > ${WRKSRC}/kcode
 	pod2man ${WRKSRC}/kcode ${WRKSRC}/kcode.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/kcode ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/kcode.1 ${MAN1PREFIX}/man/ja/man1/
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/kcode/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/japanese/mypaedia-fpw/Makefile
===================================================================
--- head/japanese/mypaedia-fpw/Makefile	(revision 148092)
+++ head/japanese/mypaedia-fpw/Makefile	(revision 148093)
@@ -1,58 +1,66 @@
 # New ports collection makefile for:	mypaedia - JIS X 4081 format version
 # Date created:        	00/02/21
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mypaedia-fpw
 PORTVERSION=	1.4.3
 PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
 DISTNAME=	mypaedia-fpw${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An encyclopedia  "Mypaedia" (EPWING V1 format)
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
 WRKSRC=		${WRKDIR}/mypaedia-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
 
 post-extract:
 	@if [ ! -f ${DICT_PATH}/INDEX/ITEM.DAT ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "Specify a mount point for Mypaedia's CD-ROM"; \
 	  ${ECHO} "and excecute the following command again:"; \
 	  ${ECHO} "  make DICT_PATH=${DICT_PATH}"; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
 
 do-build:
 #	cd ${WRKSRC}; fpwmake SRCDIR=${DICT_PATH} > /dev/null; \
 	cd ${WRKSRC}; fpwmake SRCDIR=${DICT_PATH}; \
 	fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/mypaedia-fpw/mypaedia/data
 	${MKDIR} ${PREFIX}/share/dict/mypaedia-fpw/mypaedia/gaiji
 	${INSTALL_DATA} ${WRKSRC}/honmon \
 		${PREFIX}/share/dict/mypaedia-fpw/mypaedia/data
 	${INSTALL_DATA} ${WRKSRC}/gai16f \
 		${PREFIX}/share/dict/mypaedia-fpw/mypaedia/gaiji
 	${INSTALL_DATA} ${WRKSRC}/gai16h \
 		${PREFIX}/share/dict/mypaedia-fpw/mypaedia/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/mypaedia-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for file in AUTHORS COPYING ChangeLog GAIJI.TXT MYPAEDIA-format.txt README.PKG README.TXT TOBEDONE
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/japanese/mypaedia-fpw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/japanese/otojiro-fpw/Makefile
===================================================================
--- head/japanese/otojiro-fpw/Makefile	(revision 148092)
+++ head/japanese/otojiro-fpw/Makefile	(revision 148093)
@@ -1,85 +1,92 @@
 # New ports collection makefile for:	OTOJIRO Dictionary - JIS X 4081 version
 # Date created:        	2002.9.9
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	otojiro-fpw
 PORTVERSION=	1.0.a
 PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/ \
 		http://member.nifty.ne.jp/~satomii/freepwing/archive/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.a/a/}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OTOJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/otojiro-fpw${PORTVERSION:S/.a/a/}
 DICT_PATH?=	/cdrom
 SRCFILE?=	otojiro.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 .include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 
 CDROM_PATH:=	${DICT_PATH}
 DICT_PATH:=	${WRKDIR}
 .else
 CDROM_PATH=	${NONEXISTENT}
 .endif
 
 MAKE_ENV:=	OTOJIRO_FILE=${DICT_PATH}/${SRCFILE}
 
 post-extract:
 	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
 	  ${MKDIR} ${WRKDIR}; \
 	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
 	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Otojiro Dictionary file with the full path"; \
 	  ${ECHO} "and excecute the following command again:"; \
 	  ${ECHO} "  make DICT_PATH=${DICT_PATH} SRCFILE=${SRCFILE}"; \
 	  ${ECHO} ""; \
 	  ${ECHO} "Notice: DICT_PATH must be a full path to the file."; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/FPWPARSERFLAGS = -- /FPWPARSERFLAGS = /g" ${WRKSRC}/Makefile
 
 do-build:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} fpwmake; \
 	fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/otojiro-fpw/otojiro/data
 	${MKDIR} ${PREFIX}/share/dict/otojiro-fpw/otojiro/gaiji
 	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/otojiro-fpw/otojiro/data
 #	${INSTALL_DATA} ${WRKSRC}/gai16f \
 #		${PREFIX}/share/dict/otojiro-fpw/otojiro/gaiji
 	${INSTALL_DATA} ${WRKSRC}/gai16h \
 		${PREFIX}/share/dict/otojiro-fpw/otojiro/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/otojiro-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in readme.txt COPYING
 	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/otojiro-fpw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/japanese/srd-fpw/Makefile
===================================================================
--- head/japanese/srd-fpw/Makefile	(revision 148092)
+++ head/japanese/srd-fpw/Makefile	(revision 148093)
@@ -1,62 +1,70 @@
 # New ports collection makefile for:	srd - JIS X 4081 format version
 # Date created:        	00/06/14
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	srd-fpw
 PORTVERSION=	1.1.5
 PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/srd/
 DISTNAME=	srd-fpw${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A English - Japanese Dictionary "Random House" (EPWING V1 format)
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
 RESTRICTED=	"The original dictionary is not free"
 WRKSRC=		${WRKDIR}/srd-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
 
 post-extract:
 	@if [ ! -f ${DICT_PATH}/SRD.INI ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "Specify a mount point for Random House's CD-ROM"; \
 	  ${ECHO} "or a directory which you copied it from the CD-ROM".; \
 	  ${ECHO} "And excecute the following command again:"; \
 	  ${ECHO} "  make DICT_PATH=${DICT_PATH}"; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
 
 do-build:
 #	cd ${WRKSRC}; fpwmake SRCDIR=${DICT_PATH} > /dev/null; \
 	cd ${WRKSRC}; \
 	fpwmake SRCDIR=${DICT_PATH} png; \
 	fpwmake SRCDIR=${DICT_PATH}; \
 	fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/srd-fpw/srd-fpw/data
 	${MKDIR} ${PREFIX}/share/dict/srd-fpw/srd-fpw/gaiji
 	${INSTALL_DATA} ${WRKSRC}/honmon \
 		${PREFIX}/share/dict/srd-fpw/srd-fpw/data
 	${INSTALL_DATA} ${WRKSRC}/gai16f \
 		${PREFIX}/share/dict/srd-fpw/srd-fpw/gaiji
 	${INSTALL_DATA} ${WRKSRC}/gai16h \
 		${PREFIX}/share/dict/srd-fpw/srd-fpw/gaiji
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/srd-fpw
 	${INSTALL_DATA} ${WRKSRC}/img.dat ${PREFIX}/share/dict/srd-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for file in AUTHORS COPYING ChangeLog GAIJI.TXT NEWS README.PKG README.TXT TOBEDONE
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/japanese/srd-fpw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/japanese/waeijiro-fpw/Makefile
===================================================================
--- head/japanese/waeijiro-fpw/Makefile	(revision 148092)
+++ head/japanese/waeijiro-fpw/Makefile	(revision 148093)
@@ -1,74 +1,81 @@
 # New ports collection makefile for:	WAEIJIRO Dictionary - JIS X 4081 version
 # Date created:        	2002.9.9
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	waeijiro-fpw
 PORTVERSION=	1.1
 PORTREVISION=	4
 CATEGORIES=	japanese
 #MASTER_SITES=	http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
 MASTER_SITES=	http://www.dsl.gr.jp/~tf/pool/
 #DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAEIJIRO English - Japanese Dictionary (EPWING V1 format)
 
 EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing
 BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
-		${SITE_PERL}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
 NO_PACKAGE=	"The original dictionary is not free"
 USE_GMAKE=	yes
 DICT_PATH?=	/cdrom
 SRCFILE?=	waeiji52.txt
 
 # For eijiro included in a book sold by ALC Inc.
 # (http://www.alc.co.jp/alcshop/eng/eijiro/)
 .include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
+
 DICT_ARCHIVE!=	${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE}
 .if exists(${DICT_ARCHIVE})
 EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 
 CDROM_PATH:=	${DICT_PATH}
 DICT_PATH:=	${WRKDIR}
 .else
 CDROM_PATH=	${NONEXISTENT}
 .endif
 
 MAKE_ARGS:=	SRC_DICT=${DICT_PATH}/${SRCFILE}
 
 post-extract:
 	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
 	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
 	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Waeijiro Dictionary file with the full path"; \
 	  ${ECHO} "and excecute the following command again:"; \
 	  ${ECHO} "  make DICT_PATH=${DICT_PATH} SRCFILE=${SRCFILE}"; \
 	  ${ECHO} ""; \
 	  ${ECHO} "Notice: DICT_PATH must be a full path to the file."; \
 	  ${ECHO} "###################################################"; \
 	  ${FALSE}; \
 	fi
 	${CP} ${LOCALBASE}/share/freepwing/fpwutils.mk ${WRKSRC}
 
 post-build:
 	cd ${WRKSRC}; fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/waeijiro-fpw/waeijiro/data
 	${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/waeijiro-fpw/waeijiro/data
 	${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/waeijiro-fpw
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/waeijiro-fpw/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/www/raqdevil/Makefile
===================================================================
--- head/www/raqdevil/Makefile	(revision 148092)
+++ head/www/raqdevil/Makefile	(revision 148093)
@@ -1,82 +1,88 @@
 # New ports collection makefile for:    raqdevil
 # Date created:         06 September 2005
 # Whom:                 Devon H. O'Dell <dodell@offmyserver.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	raqdevil
 PORTVERSION=	0.9.6
 CATEGORIES=	www sysutils
 MASTER_SITES=	http://www.raqdevil.com/
 
 MAINTAINER=	dodell@offmyserver.com
 COMMENT=	A port of the Sun Cobalt RaQ550 software to FreeBSD
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}	\
-		${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode			\
+		${JCODE}:${PORTSDIR}/japanese/p5-Jcode			\
 		${SITE_PERL}/mach/Quota.pm:${PORTSDIR}/sysutils/p5-Quota		\
 		${SITE_PERL}/mach/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext	\
 		${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph		\
 		${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query	\
 		logrotate:${PORTSDIR}/sysutils/logrotate	\
 		perl:${PORTSDIR}/lang/perl5.8			\
 		imapd:${PORTSDIR}/mail/imap-uw			\
 		pcretest:${PORTSDIR}/devel/pcre			\
 		snmpd:${PORTSDIR}/net-mgmt/net-snmp		\
 		proftpd:${PORTSDIR}/ftp/proftpd			\
 		qpopauth:${PORTSDIR}/mail/qpopper		\
 		xinetd:${PORTSDIR}/security/xinetd		\
 		spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin	\
 		procmail:${PORTSDIR}/mail/procmail		\
 		clamscan:${PORTSDIR}/security/clamav		\
 		analog:${PORTSDIR}/www/analog
 BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
 
 USE_GNOME=	glib20
 USE_PHP=	pcre session xml
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_APACHE=	yes
 
 WITH_APACHE2=	yes
 REINPLACE_ARGS=	-i""
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${PREFIX}/raqdevil/lib
 
 .include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500801
+JCODE=	${SITE_PERL}/${PERL_ARCH}/Jcode.pm
+.else
+JCODE=	${SITE_PERL}/Jcode.pm
+.endif
 
 .if !defined(SENDMAIL_MILTER_PORT)
 SENDMAIL_MILTER_PORT?=	sendmail-sasl
 .else
 .if ${SENDMAIL_MILTER_PORT} != "sendmail-sasl"
 pre-everything::
 	@${ECHO_MSG} "SENDMAIL_MILTER_PORT=${SENDMAIL_MILTER_PORT}
 	@${ECHO_MSG} "RAQdevil makes use of the sendmail-sasl metaport. Please set"
 	@${ECHO_MSG} "SENDMAIL_MILTER_PORT=sendmail-sasl in /etc/make.conf"
 	@${FALSE}
 .endif
 .endif
 
 pre-extract:
 .if !defined(PACKAGE_BUILDING)
 	@${SH} ${FILESDIR}/warning
 .endif
 
 post-extract:
 .if !defined(PACKAGE_BUILDING)
 	${CC} -o ${WRKSRC}/rdqchk ${FILESDIR}/rdqchk.c
 	${WRKSRC}/rdqchk
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]prefix[)]|${PREFIX}|g' ;
 	@${FIND} ${WRKSRC} -type f -name \*-e | ${XARGS} ${RM} -f
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/raqdevil/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property