From owner-freebsd-ports Mon Aug 28 10:20:56 2000 Delivered-To: freebsd-ports@freebsd.org Received: from ms.tokyo.jcom.ne.jp (ms.tokyo.jcom.ne.jp [210.234.123.18]) by hub.freebsd.org (Postfix) with ESMTP id 6D47337B43E; Mon, 28 Aug 2000 10:20:09 -0700 (PDT) Received: from daemon.local.idaemons.org (203-165-77-17.sugnm1.kt.home.ne.jp [203.165.77.17]) by ms.tokyo.jcom.ne.jp (8.9.3/3.7W 04/27/00) with ESMTP id CAA25014; Tue, 29 Aug 2000 02:20:05 +0900 (JST) Received: by daemon.local.idaemons.org (8.9.3/3.7W) id CAA02232; Tue, 29 Aug 2000 02:19:33 +0900 (JST) Date: Tue, 29 Aug 2000 02:19:32 +0900 Message-ID: <863djpwbff.wl@archon.local.idaemons.org> From: "Akinori -Aki- MUSHA" To: asami@FreeBSD.org, Steve Price Cc: freebsd-ports@FreeBSD.org, cvs-committers@FreeBSD.org Subject: New variable suggestion: PKGNAMELANGPREFIX In-Reply-To: In your message of "Sun, 27 Aug 2000 10:59:33 -0500" <20000827105933.C268@bonsai.hiwaay.net> References: <200008270613.XAA20399@freefall.freebsd.org> <20000827105933.C268@bonsai.hiwaay.net> User-Agent: Wanderlust/2.3.0 (Roam) EMIKO/1.13.12 (Euglena sociabilis) FLIM/1.13.2 (Kasanui) APEL/10.2 MULE XEmacs/21.1 (patch 12) (Channel Islands) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE X-PGP-Comment: I changed my key on 2000-08-10 MIME-Version: 1.0 (generated by EMIKO 1.13.12 - "Euglena sociabilis") Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is my second try to clean up PKGNAMEPREFIX pollution. Here I'd suggest introducing PKGNAMELANGPREFIX to give a special treatment to language specific prefixes. The main reason is that the current implementation of PKGNAMEPREFIX forces each port to know/care if the port itself or any of its slave ports is lang-specific. If you knew a port is not lang-specific and it has no lang-specific slaves, then you could just say: PKGNAMEPREFIX= foo- [...] .include On the contrary, if the port were a lang-specific port or had a lang-specific slave, you would have to say: .include PKGNAMEPREFIX:= ${PKGNAMEPREFIX}foo- [...] .include That is what is happening on such as p5-*/ja-p5-*. Secondly, there is no way to judge if a PKGNAMEPREFIX is lang-specific. Having PKGNAMELANGPREFIX separate from PKGNAMEPREFIX would makes it easier for a cross-language master-slave port to check what language it should be configured for. If it sounds like the right thing, please check and review the attached patch. Thanks in advance. -- / /__ __ / ) ) ) ) / Akinori -Aki- MUSHA aka / (_ / ( (__( @ idaemons.org / FreeBSD.org "We're only at home when we're on the run, on the wing, on the fly" Index: Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.348 diff -u -r1.348 bsd.port.mk --- Mk/bsd.port.mk 2000/08/25 19:50:45 1.348 +++ Mk/bsd.port.mk 2000/08/28 16:40:29 @@ -43,10 +43,11 @@ # # PORTNAME - Name of software. # PORTVERSION - Version of software. -# PKGNAMEPREFIX - Prefix to specify that port is language-specific, etc. -# PKGNAMESUFFIX - Suffix to specify compilation options. +# PKGNAMELANGPREFIX - Prefix to specify that port is language-specific. +# PKGNAMEPREFIX - Prefix to specify binary platforms, language platforms, etc. +# PKGNAMESUFFIX - Suffix to specify compilation options, branch names, etc. # PKGNAME - Always defined as -# ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}. +# ${PKGNAMELANGPREFIX}${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}. # Do not define this in your Makefile. # DISTNAME - Name of port or distribution used in generating # WRKSRC and DISTFILES below (default: @@ -535,7 +536,7 @@ @${ECHO} " your bsd.port.mk.)" @${FALSE} .endif -PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +PKGNAME= ${PKGNAMELANGPREFIX}${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DISTNAME?= ${PORTNAME}-${PORTVERSION} # These need to be absolute since we don't know how deep in the ports @@ -1209,7 +1210,7 @@ # The "latest version" link -- ${PKGNAME} minus everthing after the last '-' PKGLATESTREPOSITORY?= ${PACKAGES}/Latest -PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} +PKGBASE?= ${PKGNAMELANGPREFIX}${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PKGLATESTFILE?= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX} CONFIGURE_WRKSRC?= ${WRKSRC} Index: chinese/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/chinese/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- chinese/Makefile.inc 2000/08/27 16:52:43 1.4 +++ chinese/Makefile.inc 2000/08/28 11:10:32 @@ -1,4 +1,4 @@ # $FreeBSD: ports/chinese/Makefile.inc,v 1.4 2000/08/27 16:52:43 knu Exp $ # -PKGNAMEPREFIX?= zh- +PKGNAMELANGPREFIX?= zh- Index: devel/ruby-slang/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/ruby-slang/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- devel/ruby-slang/Makefile 2000/08/27 16:52:43 1.4 +++ devel/ruby-slang/Makefile 2000/08/28 15:09:08 @@ -9,6 +9,7 @@ PORTVERSION= 0.33.a CATEGORIES+= devel ruby MASTER_SITES= http://kondara.sdri.co.jp/~kikutani/ +PKGNAMEPREFIX= ruby- DISTNAME= ${PORTNAME}lib DIST_SUBDIR= ruby @@ -37,14 +38,6 @@ DOCS_EN= README changes.txt DOCS_JA= README.euc -.include - -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}ruby- -.else -PKGNAMEPREFIX= ruby- -.endif - do-configure: @cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS} @@ -67,4 +60,4 @@ .endfor .endif -.include +.include Index: editors/xemacs21-sumo/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/xemacs21-sumo/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- editors/xemacs21-sumo/Makefile 2000/08/25 00:27:00 1.11 +++ editors/xemacs21-sumo/Makefile 2000/08/28 15:11:00 @@ -15,7 +15,7 @@ MAINTAINER= kiri@pis.toba-cmt.ac.jp .if defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-" || \ - defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} != "" + defined(PKGNAMELANGPREFIX) && ${PKGNAMELANGPREFIX} != "" RUN_DEPENDS= ${LOCALBASE}/share/doc/xemacs-additional-packages:${PORTSDIR}/editors/xemacs-additional-packages \ ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.leim:${PORTSDIR}/editors/xemacs-mule-packages \ ${RUN_DEP_LIST} @@ -35,7 +35,7 @@ .include -.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "ja-" +.if defined(PKGNAMELANGPREFIX) && ${PKGNAMELANGPREFIX} == "ja-" RUN_DEP_LIST= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${PKGNAMESUFFIX} .elif defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-" RUN_DEP_LIST= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule Index: german/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/german/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- german/Makefile.inc 2000/08/27 16:52:44 1.4 +++ german/Makefile.inc 2000/08/28 11:15:28 @@ -1,4 +1,4 @@ # $FreeBSD: ports/german/Makefile.inc,v 1.4 2000/08/27 16:52:44 knu Exp $ # -PKGNAMEPREFIX?= de- +PKGNAMELANGPREFIX?= de- Index: german/webalizer2/Makefile =================================================================== RCS file: /home/ncvs/ports/german/webalizer2/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- german/webalizer2/Makefile 2000/08/10 16:16:30 1.14 +++ german/webalizer2/Makefile 2000/08/28 15:11:30 @@ -26,42 +26,42 @@ --with-language=${WEBALIZER_LANG} CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib" MAKE_ARGS+= CFLAGS="${CFLAGS}" -MAN1= ${PKGNAMEPREFIX}webalizer.1 +MAN1= ${PKGNAMELANGPREFIX}webalizer.1 DOC1= CHANGES COPYING Copyright INSTALL \ README README.FIRST DNS.README country-codes.txt WRKSRC= ${WRKDIR}/${DISTNAME:S/-src$//} -PLIST_SUB+= PKGNAMEPREFIX=${PKGNAMEPREFIX} +PLIST_SUB+= PKGNAMELANGPREFIX=${PKGNAMELANGPREFIX} pre-configure: @${PERL5} -pi -e "s=/etc=${PREFIX}/etc=" ${WRKSRC}/webalizer.c - @${PERL5} -pi -e "s=webalizer.conf=${PKGNAMEPREFIX}webalizer.conf=" \ + @${PERL5} -pi -e "s=webalizer.conf=${PKGNAMELANGPREFIX}webalizer.conf=" \ ${WRKSRC}/webalizer.c do-install: @${INSTALL_PROGRAM} ${WRKSRC}/webalizer \ - ${PREFIX}/bin/${PKGNAMEPREFIX}webalizer - ${LN} -sf ${PKGNAMEPREFIX}webalizer \ - ${PREFIX}/bin/${PKGNAMEPREFIX}webazolver + ${PREFIX}/bin/${PKGNAMELANGPREFIX}webalizer + ${LN} -sf ${PKGNAMELANGPREFIX}webalizer \ + ${PREFIX}/bin/${PKGNAMELANGPREFIX}webazolver post-install: .for i in ${MAN1} ${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i} .endfor .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer + ${MKDIR} ${PREFIX}/share/doc/${PKGNAMELANGPREFIX}webalizer .for i in ${DOC1} @${INSTALL_DATA} ${WRKSRC}/${i} \ - ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer/${i} + ${PREFIX}/share/doc/${PKGNAMELANGPREFIX}webalizer/${i} .endfor .endif - ${MKDIR} ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer + ${MKDIR} ${PREFIX}/share/examples/${PKGNAMELANGPREFIX}webalizer .for i in msfree.png sample.conf webalizer.png @${INSTALL_DATA} ${WRKSRC}/${i} \ - ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer/${i} + ${PREFIX}/share/examples/${PKGNAMELANGPREFIX}webalizer/${i} .endfor - @if [ ! -f ${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ]; then \ + @if [ ! -f ${PREFIX}/etc/${PKGNAMELANGPREFIX}webalizer.conf-dist ]; then \ ${INSTALL_DATA} ${WRKSRC}/sample.conf \ - ${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ; \ + ${PREFIX}/etc/${PKGNAMELANGPREFIX}webalizer.conf-dist ; \ fi .include Index: german/webalizer2/pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/german/webalizer2/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- german/webalizer2/pkg/PLIST 2000/07/18 07:08:54 1.4 +++ german/webalizer2/pkg/PLIST 2000/08/28 15:11:40 @@ -1,16 +1,16 @@ -bin/%%PKGNAMEPREFIX%%webalizer -@unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver -etc/%%PKGNAMEPREFIX%%webalizer.conf-dist -share/doc/%%PKGNAMEPREFIX%%webalizer/CHANGES -share/doc/%%PKGNAMEPREFIX%%webalizer/COPYING -share/doc/%%PKGNAMEPREFIX%%webalizer/Copyright -share/doc/%%PKGNAMEPREFIX%%webalizer/DNS.README -share/doc/%%PKGNAMEPREFIX%%webalizer/INSTALL -share/doc/%%PKGNAMEPREFIX%%webalizer/README -share/doc/%%PKGNAMEPREFIX%%webalizer/README.FIRST -share/doc/%%PKGNAMEPREFIX%%webalizer/country-codes.txt -@dirrm share/doc/%%PKGNAMEPREFIX%%webalizer -share/examples/%%PKGNAMEPREFIX%%webalizer/msfree.png -share/examples/%%PKGNAMEPREFIX%%webalizer/sample.conf -share/examples/%%PKGNAMEPREFIX%%webalizer/webalizer.png -@dirrm share/examples/%%PKGNAMEPREFIX%%webalizer +bin/%%PKGNAMELANGPREFIX%%webalizer +@unexec rm -f %B/%%PKGNAMELANGPREFIX%%webazolver +etc/%%PKGNAMELANGPREFIX%%webalizer.conf-dist +share/doc/%%PKGNAMELANGPREFIX%%webalizer/CHANGES +share/doc/%%PKGNAMELANGPREFIX%%webalizer/COPYING +share/doc/%%PKGNAMELANGPREFIX%%webalizer/Copyright +share/doc/%%PKGNAMELANGPREFIX%%webalizer/DNS.README +share/doc/%%PKGNAMELANGPREFIX%%webalizer/INSTALL +share/doc/%%PKGNAMELANGPREFIX%%webalizer/README +share/doc/%%PKGNAMELANGPREFIX%%webalizer/README.FIRST +share/doc/%%PKGNAMELANGPREFIX%%webalizer/country-codes.txt +@dirrm share/doc/%%PKGNAMELANGPREFIX%%webalizer +share/examples/%%PKGNAMELANGPREFIX%%webalizer/msfree.png +share/examples/%%PKGNAMELANGPREFIX%%webalizer/sample.conf +share/examples/%%PKGNAMELANGPREFIX%%webalizer/webalizer.png +@dirrm share/examples/%%PKGNAMELANGPREFIX%%webalizer Index: hebrew/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/hebrew/Makefile.inc,v retrieving revision 1.3 diff -u -r1.3 Makefile.inc --- hebrew/Makefile.inc 2000/08/27 16:52:44 1.3 +++ hebrew/Makefile.inc 2000/08/28 11:15:34 @@ -1,4 +1,4 @@ # $FreeBSD: ports/hebrew/Makefile.inc,v 1.3 2000/08/27 16:52:44 knu Exp $ # -PKGNAMEPREFIX?= iw- +PKGNAMELANGPREFIX?= iw- Index: japanese/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/japanese/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- japanese/Makefile.inc 2000/08/27 16:52:44 1.4 +++ japanese/Makefile.inc 2000/08/28 16:28:24 @@ -1,4 +1,4 @@ # $FreeBSD: ports/japanese/Makefile.inc,v 1.4 2000/08/27 16:52:44 knu Exp $ # -PKGNAMEPREFIX?= ja- +PKGNAMELANGPREFIX?= ja- Index: japanese/Wnn/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/Wnn/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- japanese/Wnn/Makefile 2000/08/11 02:56:25 1.32 +++ japanese/Wnn/Makefile 2000/08/28 11:12:20 @@ -36,7 +36,7 @@ .include -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- DISTFILES+= pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff PORT_DOCDIR= ${PREFIX}/share/doc/ja-Wnn DOC_FROM= ${WRKSRC}/Wnn @@ -47,7 +47,7 @@ .else BuildWnn= NO .endif -.if ${PKGNAMEPREFIX} == zh- +.if ${PKGNAMELANGPREFIX} == zh- PORT_DOCDIR= ${PREFIX}/share/doc/zh-Wnn DOC_FROM= ${WRKSRC}/cWnn BuildCWnn= YES @@ -55,7 +55,7 @@ .else BuildCWnn= NO .endif -.if ${PKGNAMEPREFIX} == ko- +.if ${PKGNAMELANGPREFIX} == ko- # kWnn has no manual. BuildKWnn= YES SHARED_LIB= libkwnn4 @@ -77,7 +77,7 @@ ${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \ -C ${WRKSRC} ${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC} .endif @@ -85,7 +85,7 @@ cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98 #### pubdic+ -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- post-patch: cd ${PUBDICPDIR}; \ ${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \ @@ -118,7 +118,7 @@ pre-build: #### pubdic+ -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \ cd ${WRKSRC}/Pubdic; \ for file in ${WDICS}; do \ @@ -136,7 +136,7 @@ # @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World) #### gerodic -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- post-build: cd ${WRKSRC}/Contrib/dic/gerodic; \ ${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u @@ -148,7 +148,7 @@ post-install: #### gerodic -.if ${PKGNAMEPREFIX} == ja- +.if ${PKGNAMELANGPREFIX} == ja- cd ${WRKSRC}/Contrib/dic/gerodic; \ make all install .endif Index: japanese/p5-Jcode/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-Jcode/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- japanese/p5-Jcode/Makefile 2000/08/27 16:52:45 1.9 +++ japanese/p5-Jcode/Makefile 2000/08/28 15:13:53 @@ -10,6 +10,7 @@ CATEGORIES= japanese perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DANKOGAI +PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org @@ -23,10 +24,6 @@ Jcode::Unicode::NoXS.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" @@ -35,4 +32,4 @@ ${PERL} -pi -e "s:CC = cc:CC = ${CC}:g" ${WRKSRC}/${DIR}/Makefile .endfor -.include +.include Index: japanese/p5-Text-Kakasi/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-Text-Kakasi/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- japanese/p5-Text-Kakasi/Makefile 2000/08/27 16:52:45 1.7 +++ japanese/p5-Text-Kakasi/Makefile 2000/08/28 15:14:16 @@ -9,6 +9,7 @@ PORTVERSION= 1.04 CATEGORIES= japanese perl5 MASTER_SITES= http://www.daionet.gr.jp/~knok/kakasi/ +PKGNAMEPREFIX= p5- MAINTAINER= knu@FreeBSD.org @@ -19,12 +20,8 @@ MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Text::Kakasi.3 -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" -.include +.include Index: japanese/p5-jcode.pl/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-jcode.pl/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- japanese/p5-jcode.pl/Makefile 2000/08/27 16:52:45 1.10 +++ japanese/p5-jcode.pl/Makefile 2000/08/28 15:14:54 @@ -10,6 +10,7 @@ CATEGORIES= japanese perl5 MASTER_SITES= ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \ ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/ +PKGNAMEPREFIX= p5- EXTRACT_SUFX= # none MAINTAINER= sada@FreeBSD.org @@ -25,12 +26,8 @@ INSTALL_BASE= lib/perl5/site_perl/${PERL_VER} INSTALL_DIR= ${PREFIX}/${INSTALL_BASE} -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - do-install: ${MKDIR} ${INSTALL_DIR} ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${INSTALL_DIR}/jcode.pl -.include +.include Index: japanese/p5-manual/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-manual/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- japanese/p5-manual/Makefile 2000/08/27 16:52:46 1.7 +++ japanese/p5-manual/Makefile 2000/08/28 15:15:17 @@ -9,6 +9,7 @@ PORTVERSION= 5.000 CATEGORIES= japanese perl5 MASTER_SITES= ftp://ftp.sra.co.jp/pub/lang/perl/ +PKGNAMEPREFIX= p5- DISTNAME= perl${PORTVERSION}${PORTNAME}-j MAINTAINER= sada@FreeBSD.org @@ -29,10 +30,6 @@ Open2.3pm Open3.3pm POSIX.3pm Ping.3pm Socket.3pm \ integer.3pm less.3pm sigtrap.3pm strict.3pm subs.3pm -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - post-extract: @cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ perl5man.tgz ${EXTRACT_AFTER_ARGS} @@ -49,7 +46,7 @@ .endfor .endfor -.include +.include plist: @${ECHO} -n >${PLIST} Index: japanese/p5-mkres/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-mkres/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- japanese/p5-mkres/Makefile 2000/08/27 16:52:49 1.8 +++ japanese/p5-mkres/Makefile 2000/08/28 15:15:37 @@ -9,6 +9,7 @@ PORTVERSION= 1.4 CATEGORIES= japanese perl5 MASTER_SITES= http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/ +PKGNAMEPREFIX= p5- EXTRACT_SUFX= # none DISTNAME= ${PORTNAME}.pl-${PORTVERSION} @@ -19,10 +20,6 @@ USE_PERL5= yes NO_WRKSUBDIR= yes -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @@ -39,4 +36,4 @@ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \ ${PREFIX}/bin/mkres.pl -.include +.include Index: japanese/p5-nkf/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-nkf/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- japanese/p5-nkf/Makefile 2000/08/27 16:52:49 1.6 +++ japanese/p5-nkf/Makefile 2000/08/28 15:15:55 @@ -11,6 +11,7 @@ MASTER_SITES= ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/ \ ftp://ftp.win.ne.jp/pub/misc/ \ ftp://ftp.eos.hokudai.ac.jp/pub/tools/code-conv/nkf/ +PKGNAMEPREFIX= p5- EXTRACT_SUFX= .shar DISTNAME= ${PORTNAME}171 @@ -25,12 +26,8 @@ MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= NKF.3 -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- - do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" -.include +.include Index: japanese/ruby-kakasi/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/ruby-kakasi/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- japanese/ruby-kakasi/Makefile 2000/08/27 16:52:49 1.3 +++ japanese/ruby-kakasi/Makefile 2000/08/28 15:16:14 @@ -9,6 +9,7 @@ PORTVERSION= 000124 CATEGORIES= japanese ruby MASTER_SITES= http://www.notwork.org/~gotoken/ruby/p/kakasi/ +PKGNAMEPREFIX= ruby- DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -29,10 +30,6 @@ DOCS_EN= ChangeLog README wdcnt.html DOCS_JA= README.jp -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}ruby- - post-patch: ${PERL} -i -pe 's,/usr/local,${PREFIX},g' ${WRKSRC}/extconf.rb ${PERL} -i -pe 's,\./(kakasi),$$1,g' ${WRKSRC}/test.rb @@ -55,4 +52,4 @@ .endfor .endif -.include +.include Index: japanese/ruby-uconv/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/ruby-uconv/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- japanese/ruby-uconv/Makefile 2000/08/27 16:52:49 1.5 +++ japanese/ruby-uconv/Makefile 2000/08/28 15:16:49 @@ -11,6 +11,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.bekkoame.ne.jp/~yoshidam/ MASTER_SITE_SUBDIR= knu +PKGNAMEPREFIX= ruby- DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -30,10 +31,6 @@ EXAMPLES= euc2unicode.rb test_euc.txt test_euc.xml \ trilang.xml unicode2euc.rb xmlconv.rb -.include - -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}ruby- - do-configure: @cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb @@ -49,4 +46,4 @@ ${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/ruby/uconv/ja/ .endif -.include +.include Index: korean/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/korean/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- korean/Makefile.inc 2000/08/27 16:52:50 1.4 +++ korean/Makefile.inc 2000/08/28 11:15:47 @@ -1,4 +1,4 @@ # $FreeBSD: ports/korean/Makefile.inc,v 1.4 2000/08/27 16:52:50 knu Exp $ # -PKGNAMEPREFIX?= ko- +PKGNAMELANGPREFIX?= ko- Index: korean/linux_locale/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/linux_locale/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- korean/linux_locale/Makefile 2000/04/13 09:16:54 1.5 +++ korean/linux_locale/Makefile 2000/08/28 15:17:09 @@ -9,7 +9,7 @@ PORTVERSION= 1.0 CATEGORIES= korean emulators linux MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ -DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION} +DISTNAME= ${PORTNAME}-${PKGNAMELANGPREFIX}${PORTVERSION} MAINTAINER= cjh@kr.freebsd.org Index: russian/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/russian/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- russian/Makefile.inc 2000/08/27 16:52:51 1.4 +++ russian/Makefile.inc 2000/08/28 11:15:52 @@ -1,4 +1,4 @@ # $FreeBSD: ports/russian/Makefile.inc,v 1.4 2000/08/27 16:52:51 knu Exp $ # -PKGNAMEPREFIX?= ru- +PKGNAMELANGPREFIX?= ru- Index: vietnamese/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/vietnamese/Makefile.inc,v retrieving revision 1.4 diff -u -r1.4 Makefile.inc --- vietnamese/Makefile.inc 2000/08/27 16:52:51 1.4 +++ vietnamese/Makefile.inc 2000/08/28 11:15:57 @@ -1,4 +1,4 @@ # $FreeBSD: ports/vietnamese/Makefile.inc,v 1.4 2000/08/27 16:52:51 knu Exp $ # -PKGNAMEPREFIX?= vi- +PKGNAMELANGPREFIX?= vi- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message