Date: Mon, 15 Oct 2001 06:10:39 -0700 (PDT) From: TOGAWA Satoshi <toga@puyo.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/31287: port update: japanese/nkf and japanese/p5-nkf to 1.92 Message-ID: <200110151310.f9FDAd749891@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 31287
>Category: ports
>Synopsis: port update: japanese/nkf and japanese/p5-nkf to 1.92
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 15 06:20:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: TOGAWA Satoshi
>Release: 4-STABLE
>Organization:
>Environment:
FreeBSD cel.sd.puyo.org 4.4-STABLE FreeBSD 4.4-STABLE #36: Sat Oct 13 00:46:57 JST 2001 togawa@cel.sd.puyo.org:/usr/obj/usr/src/sys/CEL i386
>Description:
Changes:
* Both
+ Updating from 1.71 to 1.92
+ Two sites in MASTER_SITES are now closed.
+ Before building nkf-1.92, we first must mkdir ${WRKDIR}/NKF,
otherwise we cannot build it (mmm...).
* japanese/nkf
+ Using ${BSD_INSTALL_*} instead of ${INSTALL}.
>How-To-Repeat:
>Fix:
diff -urN nkf/Makefile nkf.new/Makefile
--- nkf/Makefile Tue Apr 11 23:15:48 2000
+++ nkf.new/Makefile Sat Sep 8 00:20:22 2001
@@ -6,11 +6,9 @@
#
PORTNAME= nkf
-PORTVERSION= 1.71
+PORTVERSION= 1.92
CATEGORIES= japanese
-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/
+MASTER_SITES= ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/
EXTRACT_SUFX= .shar
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
@@ -23,5 +21,15 @@
NO_WRKSUBDIR= yes
MAN1= nkf.1 ../ja/man1/nkf.1
ALL_TARGET= nkf
+
+do-extract:
+ ${RM} -rf ${WRKDIR}
+ ${MKDIR} ${WRKDIR}/NKF
+ for file in ${EXTRACT_ONLY}; do \
+ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+ then \
+ exit 1; \
+ fi \
+ done
.include <bsd.port.mk>
diff -urN nkf/distinfo nkf.new/distinfo
--- nkf/distinfo Wed Feb 23 14:05:50 2000
+++ nkf.new/distinfo Fri Sep 7 23:37:20 2001
@@ -1 +1 @@
-MD5 (nkf171.shar) = 15c8a80760f5da0416c89cce1690c870
+MD5 (nkf192.shar) = 2e560387657d5d7c725875e548394b0f
diff -urN nkf/files/patch-aa nkf.new/files/patch-aa
--- nkf/files/patch-aa Wed Mar 8 20:19:17 2000
+++ nkf.new/files/patch-aa Sat Sep 8 00:33:29 2001
@@ -1,6 +1,6 @@
---- Makefile.orig Mon Nov 16 19:21:45 1998
-+++ Makefile Sun Mar 5 05:33:25 2000
-@@ -1,14 +1,22 @@
+--- Makefile.orig Sat Sep 8 00:32:13 2001
++++ Makefile Sat Sep 8 00:33:18 2001
+@@ -1,16 +1,23 @@
-CC = cc
-CFLAGS = -O
+PREFIX?=/usr/local
@@ -10,20 +10,21 @@
# SHAR = shar
-PERL = perl5
+PERL?= perl5
-+INSTALL?=/usr/bin/install
+ RM = rm -rf
+ VERSION = 19
nkf : nkf.c
$(CC) $(CFLAGS) -o nkf nkf.c
+ ./nkf -e nkf.1j > nkf.1j.euc
+
+install:
-+ ${INSTALL} -c -o root -g wheel -m 555 nkf ${PREFIX}/bin
-+ ${INSTALL} -c -o root -g wheel -m 444 nkf.1 ${PREFIX}/man/man1/nkf.1
-+ ${INSTALL} -c -o root -g wheel -m 444 nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
++ ${BSD_INSTALL_PROGRAM} nkf ${PREFIX}/bin
++ ${BSD_INSTALL_MAN} nkf.1 ${PREFIX}/man/man1/nkf.1
++ ${BSD_INSTALL_MAN} nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
clean:
-- rm -fr nkf.o nkf nkf.in nkf.out nkf17 *~
-+ rm -fr nkf.o nkf nkf.in nkf.out nkf17 nkf.1j.euc *~
+- -$(RM) nkf.o nkf nkf.in nkf.out nkf$(VERSION) *~ *.bad
++ -$(RM) nkf.o nkf nkf.in nkf.out nkf$(VERSION) nkf.1j.euc *~ *.bad
+ cd NKF; make clean
test: nkf
- perl nkf_test.pl
-
+ $(PERL) test.pl
diff -urN p5-nkf/Makefile p5-nkf.new/Makefile
--- p5-nkf/Makefile Fri Mar 2 18:03:06 2001
+++ p5-nkf.new/Makefile Sat Sep 8 00:48:18 2001
@@ -6,13 +6,11 @@
#
PORTNAME= nkf
-PORTVERSION= 0.01
+PORTVERSION= 1.92
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/
+MASTER_SITES= ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/
EXTRACT_SUFX= .shar
-DISTNAME= ${PORTNAME}171
+DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= max@FreeBSD.org
@@ -24,6 +22,16 @@
WRKSRC= ${WRKDIR}/NKF
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= NKF.3
+
+do-extract:
+ ${RM} -rf ${WRKDIR}
+ ${MKDIR} ${WRKDIR}/NKF
+ for file in ${EXTRACT_ONLY}; do \
+ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+ then \
+ exit 1; \
+ fi \
+ done
.include <bsd.port.pre.mk>
diff -urN p5-nkf/distinfo p5-nkf.new/distinfo
--- p5-nkf/distinfo Wed Feb 23 15:30:35 2000
+++ p5-nkf.new/distinfo Sat Sep 8 00:44:22 2001
@@ -1 +1 @@
-MD5 (nkf171.shar) = 15c8a80760f5da0416c89cce1690c870
+MD5 (nkf192.shar) = 2e560387657d5d7c725875e548394b0f
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110151310.f9FDAd749891>