diff options
author | Akinori MUSHA <knu@FreeBSD.org> | 2000-08-27 16:52:51 +0000 |
---|---|---|
committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-08-27 16:52:51 +0000 |
commit | 2e87c89fc5e16deb207adcbb0f7cbb1f27cfed05 (patch) | |
tree | 9b1e47232ef5d5948a1c3465db51086898b8c450 | |
parent | Add the db3 port. (diff) |
Back out the previous commit. That one has a problem which occurs on
cross-language master-slave ports.
I just wonder how I could overlook this. I thought I tested with Wnn,
netscape and so on. *sigh*
Yes, I know how I can fix it, but I'd certainly back out first.
Reported by: steve
Pointy hat to: knu
Notes
Notes:
svn path=/head/; revision=32040
-rw-r--r-- | chinese/Makefile.inc | 6 | ||||
-rw-r--r-- | devel/ruby-slang/Makefile | 7 | ||||
-rw-r--r-- | german/Makefile.inc | 6 | ||||
-rw-r--r-- | hebrew/Makefile.inc | 6 | ||||
-rw-r--r-- | japanese/Makefile.inc | 6 | ||||
-rw-r--r-- | japanese/p5-Jcode/Makefile | 7 | ||||
-rw-r--r-- | japanese/p5-Text-Kakasi/Makefile | 7 | ||||
-rw-r--r-- | japanese/p5-jcode.pl/Makefile | 7 | ||||
-rw-r--r-- | japanese/p5-manual/Makefile | 7 | ||||
-rw-r--r-- | japanese/p5-mkres/Makefile | 9 | ||||
-rw-r--r-- | japanese/p5-nkf/Makefile | 9 | ||||
-rw-r--r-- | japanese/ruby-kakasi/Makefile | 7 | ||||
-rw-r--r-- | japanese/ruby-uconv/Makefile | 7 | ||||
-rw-r--r-- | korean/Makefile.inc | 6 | ||||
-rw-r--r-- | russian/Makefile.inc | 6 | ||||
-rw-r--r-- | vietnamese/Makefile.inc | 6 |
16 files changed, 55 insertions, 54 deletions
diff --git a/chinese/Makefile.inc b/chinese/Makefile.inc index a1148be38a51..53f91c1412d7 100644 --- a/chinese/Makefile.inc +++ b/chinese/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= zh-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= zh- -.endif +PKGNAMEPREFIX?= zh- diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile index 497a78429ff0..729dfdcdd20a 100644 --- a/devel/ruby-slang/Makefile +++ b/devel/ruby-slang/Makefile @@ -9,7 +9,6 @@ PORTNAME= slang PORTVERSION= 0.33.a CATEGORIES+= devel ruby MASTER_SITES= http://kondara.sdri.co.jp/~kikutani/ -PKGNAMEPREFIX= ruby- DISTNAME= ${PORTNAME}lib DIST_SUBDIR= ruby @@ -40,6 +39,12 @@ DOCS_JA= README.euc .include <bsd.port.pre.mk> +.if defined(PKGNAMEPREFIX) +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}ruby- +.else +PKGNAMEPREFIX= ruby- +.endif + do-configure: @cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS} diff --git a/german/Makefile.inc b/german/Makefile.inc index b216180181f0..66710e6c53e4 100644 --- a/german/Makefile.inc +++ b/german/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= de-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= de- -.endif +PKGNAMEPREFIX?= de- diff --git a/hebrew/Makefile.inc b/hebrew/Makefile.inc index e4c1713bf2f2..b0a5ffcb91fe 100644 --- a/hebrew/Makefile.inc +++ b/hebrew/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= iw-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= iw- -.endif +PKGNAMEPREFIX?= iw- diff --git a/japanese/Makefile.inc b/japanese/Makefile.inc index 3873da50fcb9..03383ebd6a28 100644 --- a/japanese/Makefile.inc +++ b/japanese/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= ja-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= ja- -.endif +PKGNAMEPREFIX?= ja- diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile index 3e8f0df05a7c..b8b9a3862ede 100644 --- a/japanese/p5-Jcode/Makefile +++ b/japanese/p5-Jcode/Makefile @@ -10,7 +10,6 @@ PORTVERSION= 0.60 CATEGORIES= japanese perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/D/DA/DANKOGAI -PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org @@ -24,6 +23,10 @@ MAN3= Jcode.3 Jcode::Unicode.3 Jcode::Unicode::Constants.3 \ Jcode::Unicode::NoXS.3 MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" @@ -32,4 +35,4 @@ do-configure: ${PERL} -pi -e "s:CC = cc:CC = ${CC}:g" ${WRKSRC}/${DIR}/Makefile .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile index 2dc0b10ae4a3..e3c701b83fb9 100644 --- a/japanese/p5-Text-Kakasi/Makefile +++ b/japanese/p5-Text-Kakasi/Makefile @@ -9,7 +9,6 @@ PORTNAME= Text-Kakasi PORTVERSION= 1.04 CATEGORIES= japanese perl5 MASTER_SITES= http://www.daionet.gr.jp/~knok/kakasi/ -PKGNAMEPREFIX= p5- MAINTAINER= knu@FreeBSD.org @@ -20,8 +19,12 @@ USE_PERL5= yes MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Text::Kakasi.3 +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/p5-jcode.pl/Makefile b/japanese/p5-jcode.pl/Makefile index a59dd669e487..469d61a1d8b4 100644 --- a/japanese/p5-jcode.pl/Makefile +++ b/japanese/p5-jcode.pl/Makefile @@ -10,7 +10,6 @@ PORTVERSION= 2.11 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 @@ -26,8 +25,12 @@ PLIST_SUB= INSTALL_BASE=${INSTALL_BASE} INSTALL_BASE= lib/perl5/site_perl/${PERL_VER} INSTALL_DIR= ${PREFIX}/${INSTALL_BASE} +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + do-install: ${MKDIR} ${INSTALL_DIR} ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${INSTALL_DIR}/jcode.pl -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile index 4b5943cfa320..4a57ade2665d 100644 --- a/japanese/p5-manual/Makefile +++ b/japanese/p5-manual/Makefile @@ -9,7 +9,6 @@ PORTNAME= man 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 @@ -30,6 +29,10 @@ CAT3= Abbrev.3pm AnyDBMFile.3pm AutoLoader.3pm AutoSplit.3pm \ Open2.3pm Open3.3pm POSIX.3pm Ping.3pm Socket.3pm \ integer.3pm less.3pm sigtrap.3pm strict.3pm subs.3pm +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + post-extract: @cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ perl5man.tgz ${EXTRACT_AFTER_ARGS} @@ -46,7 +49,7 @@ do-install: .endfor .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> plist: @${ECHO} -n >${PLIST} diff --git a/japanese/p5-mkres/Makefile b/japanese/p5-mkres/Makefile index e027722fb1fd..25f08e3351ee 100644 --- a/japanese/p5-mkres/Makefile +++ b/japanese/p5-mkres/Makefile @@ -9,9 +9,8 @@ PORTNAME= mkres PORTVERSION= 1.4 CATEGORIES= japanese perl5 MASTER_SITES= http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/ -PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}.pl-${PORTVERSION} EXTRACT_SUFX= # none +DISTNAME= ${PORTNAME}.pl-${PORTVERSION} MAINTAINER= taoka@FreeBSD.org @@ -20,6 +19,10 @@ RUN_DEPENDS= mkttfdir:${PORTSDIR}/print/perlftlib USE_PERL5= yes NO_WRKSUBDIR= yes +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @@ -36,4 +39,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \ ${PREFIX}/bin/mkres.pl -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile index 4dbbe86515e4..a1c5e6fb82ad 100644 --- a/japanese/p5-nkf/Makefile +++ b/japanese/p5-nkf/Makefile @@ -11,9 +11,8 @@ CATEGORIES= japanese perl5 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- -DISTNAME= ${PORTNAME}171 EXTRACT_SUFX= .shar +DISTNAME= ${PORTNAME}171 MAINTAINER= max@FreeBSD.org @@ -26,8 +25,12 @@ WRKSRC= ${WRKDIR}/NKF MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= NKF.3 +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- + do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ CC="${CC}" CCFLAGS="${CFLAGS}" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/ruby-kakasi/Makefile b/japanese/ruby-kakasi/Makefile index 2d58cacc27cd..85b324f33d53 100644 --- a/japanese/ruby-kakasi/Makefile +++ b/japanese/ruby-kakasi/Makefile @@ -9,7 +9,6 @@ PORTNAME= kakasi PORTVERSION= 000124 CATEGORIES= japanese ruby MASTER_SITES= http://www.notwork.org/~gotoken/ruby/p/kakasi/ -PKGNAMEPREFIX= ruby- DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -30,6 +29,10 @@ RUBY_ARCH?= ${ARCH}-freebsd${OSREL} DOCS_EN= ChangeLog README wdcnt.html DOCS_JA= README.jp +.include <bsd.port.pre.mk> + +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 @@ -52,4 +55,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile index 451990937b84..c9a9cf73b538 100644 --- a/japanese/ruby-uconv/Makefile +++ b/japanese/ruby-uconv/Makefile @@ -11,7 +11,6 @@ CATEGORIES= japanese converters ruby MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://www.bekkoame.ne.jp/~yoshidam/ MASTER_SITE_SUBDIR= knu -PKGNAMEPREFIX= ruby- DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org @@ -31,6 +30,10 @@ RUBY_ARCH= ${ARCH}-freebsd${OSREL} EXAMPLES= euc2unicode.rb test_euc.txt test_euc.xml \ trilang.xml unicode2euc.rb xmlconv.rb +.include <bsd.port.pre.mk> + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}ruby- + do-configure: @cd ${WRKSRC}; \ ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb @@ -46,4 +49,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/ruby/uconv/ja/ .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/korean/Makefile.inc b/korean/Makefile.inc index 204f012e4866..2a636862b1ab 100644 --- a/korean/Makefile.inc +++ b/korean/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= ko-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= ko- -.endif +PKGNAMEPREFIX?= ko- diff --git a/russian/Makefile.inc b/russian/Makefile.inc index ca55da11fda8..967fd1dacdbe 100644 --- a/russian/Makefile.inc +++ b/russian/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= ru-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= ru- -.endif +PKGNAMEPREFIX?= ru- diff --git a/vietnamese/Makefile.inc b/vietnamese/Makefile.inc index 23f046c06159..752f9f007c36 100644 --- a/vietnamese/Makefile.inc +++ b/vietnamese/Makefile.inc @@ -1,8 +1,4 @@ # $FreeBSD$ # -.if defined(PKGNAMEPREFIX) -PKGNAMEPREFIX:= vi-${PKGNAMEPREFIX} -.else -PKGNAMEPREFIX= vi- -.endif +PKGNAMEPREFIX?= vi- |