Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2014 19:34:34 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342597 - in head/japanese/nkf: . files
Message-ID:  <201402041934.s14JYYjP021757@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Tue Feb  4 19:34:34 2014
New Revision: 342597
URL: http://svnweb.freebsd.org/changeset/ports/342597
QAT: https://qat.redports.org/buildarchive/r342597/

Log:
  Update to 2.1.3.
  
  Submitted by:	Takefu
  PR:		ports/185128

Modified:
  head/japanese/nkf/Makefile
  head/japanese/nkf/distinfo
  head/japanese/nkf/files/patch-Makefile

Modified: head/japanese/nkf/Makefile
==============================================================================
--- head/japanese/nkf/Makefile	Tue Feb  4 19:28:12 2014	(r342596)
+++ head/japanese/nkf/Makefile	Tue Feb  4 19:34:34 2014	(r342597)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	nkf
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.3
 PORTEPOCH=	1
 CATEGORIES?=	japanese
-MASTER_SITES=	SFJP/${PORTNAME}/53171
+MASTER_SITES=	SFJP/${PORTNAME}/59912
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Network Kanji code conversion Filter
@@ -13,11 +13,7 @@ COMMENT=	Network Kanji code conversion F
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/nkf.c
 
-ALL_TARGET=	nkf
-PLIST_FILES=	bin/nkf
+MAKE_ENV=	MKDIR="${MKDIR}"
+PLIST_FILES=	bin/nkf man/man1/nkf.1.gz man/ja/man1/nkf.1.gz
 
-MAN1=		nkf.1
-MANLANG=	"" ja
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/japanese/nkf/distinfo
==============================================================================
--- head/japanese/nkf/distinfo	Tue Feb  4 19:28:12 2014	(r342596)
+++ head/japanese/nkf/distinfo	Tue Feb  4 19:34:34 2014	(r342597)
@@ -1,2 +1,2 @@
-SHA256 (nkf-2.1.2.tar.gz) = 034e8b676160fa7cfaf023ad130ce2d7a7309e917c8f41b308e9dc2f6218a0a6
-SIZE (nkf-2.1.2.tar.gz) = 158127
+SHA256 (nkf-2.1.3.tar.gz) = 8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2
+SIZE (nkf-2.1.3.tar.gz) = 195020

Modified: head/japanese/nkf/files/patch-Makefile
==============================================================================
--- head/japanese/nkf/files/patch-Makefile	Tue Feb  4 19:28:12 2014	(r342596)
+++ head/japanese/nkf/files/patch-Makefile	Tue Feb  4 19:34:34 2014	(r342597)
@@ -1,38 +1,45 @@
---- Makefile.orig	2009-11-17 09:33:04.000000000 +0900
-+++ Makefile	2010-02-15 23:02:44.471546444 +0900
-@@ -1,18 +1,22 @@
+--- Makefile.orig	2013-11-22 14:17:36.000000000 +0900
++++ Makefile	2013-12-26 10:08:41.000000000 +0900
+@@ -1,21 +1,31 @@
 -CC = cc
 -CFLAGS = -g -O2 -Wall -pedantic
-+CC?= cc
-+CFLAGS?= -g -O2 -Wall -pedantic
++CC? = cc
++CFLAGS? = -g -O2 -Wall -pedantic
  # CFLAGS = -O3
  SHAR = shar 
  # SHAR = shar -T
--PERL = perl
--RM = rm -rf
-+PERL?= perl
-+RM?= rm -rf
- VERSION = 2.1.2
- MKDIR = mkdir
+ PERL = perl
+ RM = rm -rf
+ VERSION = 2.1.3
+-MKDIR = mkdir
 -prefix = /usr/local
-+PREFIX?= /usr/local
-+INSTALL?= /usr/bin/install
++MKDIR? = mkdir
++prefix = $(DESTDIR)$(PREFIX)
++manprefix = $(DESTDIR)$(MANPREFIX)
+ PYTHON2 = python
+ PYTHON3 = python
 +BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
 +BSD_INSTALL_MAN?= ${INSTALL}    -o root -g wheel -m 444
  
  .PHONY: clean install test tar shar
  
++all: nkf man
++
  nkf : nkf.o utf8tbl.o
  	$(CC) $(CFLAGS) -o nkf nkf.o utf8tbl.o
-+	./nkf -e nkf.1j > nkf.1j.euc
  
++man: nkf.1j nkf.1j.euc
++
++nkf.1j.euc: nkf nkf.1j
++	./nkf -e nkf.1j > nkf.1j.euc
++
  nkf.o : nkf.c nkf.h utf8tbl.h config.h
  	$(CC) $(CFLAGS) -c nkf.c
-@@ -34,14 +38,14 @@
- 	make test )
+ 
+@@ -45,13 +55,11 @@
  
  install:
--	-$(MKDIR) $(prefix)/bin
+ 	-$(MKDIR) $(prefix)/bin
 -	-$(MKDIR) $(prefix)/man
 -	-$(MKDIR) $(prefix)/man/man1
 -	-$(MKDIR) $(prefix)/man/ja
@@ -40,14 +47,11 @@
 -	cp -f nkf $(prefix)/bin/
 -	cp -f nkf.1 $(prefix)/man/man1/
 -	cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1
-+	-$(MKDIR) -p $(PREFIX)/bin
-+	-$(MKDIR) -p $(PREFIX)/man
-+	-$(MKDIR) -p $(PREFIX)/man/man1
-+	-$(MKDIR) -p $(PREFIX)/man/ja
-+	-$(MKDIR) -p $(PREFIX)/man/ja/man1
-+	${BSD_INSTALL_PROGRAM} nkf ${PREFIX}/bin/
-+	${BSD_INSTALL_MAN} nkf.1 ${PREFIX}/man/man1/
-+	${BSD_INSTALL_MAN} nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
++	-$(MKDIR) $(manprefix)/man/man1
++	-$(MKDIR) $(manprefix)/man/ja/man1
++	${BSD_INSTALL_PROGRAM} nkf $(prefix)/bin/
++	${BSD_INSTALL_MAN} nkf.1 $(manprefix)/man/man1/
++	${BSD_INSTALL_MAN} nkf.1j.euc $(manprefix)/man/ja/man1/nkf.1
  
  shar:
  	-mkdir nkf-$(VERSION)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402041934.s14JYYjP021757>