aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2009-06-01 23:44:00 +0800
committeritetcu <itetcu@FreeBSD.org>2009-06-01 23:44:00 +0800
commite001545ceb6ba8a8c346d790e4a8e369cfd2219b (patch)
tree1ca6f85f0272f19bd66e05b03467146c55d72f35
parent8c7c059ef5b08782543a2485d087c2ff8f679edc (diff)
downloadfreebsd-ports-gnome-e001545ceb6ba8a8c346d790e4a8e369cfd2219b.tar.gz
freebsd-ports-gnome-e001545ceb6ba8a8c346d790e4a8e369cfd2219b.tar.zst
freebsd-ports-gnome-e001545ceb6ba8a8c346d790e4a8e369cfd2219b.zip
Patch Makefile to respect PREFIX and use our INSTALL macros.
Reported by: QATty
-rw-r--r--chinese/gb2jis/Makefile11
-rw-r--r--chinese/gb2jis/files/patch-Makefile (renamed from chinese/gb2jis/files/patch-aa)20
2 files changed, 15 insertions, 16 deletions
diff --git a/chinese/gb2jis/Makefile b/chinese/gb2jis/Makefile
index 24fb5e00903f..396b194c8acf 100644
--- a/chinese/gb2jis/Makefile
+++ b/chinese/gb2jis/Makefile
@@ -9,19 +9,14 @@ PORTNAME= gb2jis
PORTVERSION= 1.5
CATEGORIES= chinese
MASTER_SITES= http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/program/
-DISTFILES= gb2jis.tar.Z
+DISTFILES= ${PORTNAME}.tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert GuoBiao Hanzi to JIS Kanji
-WRKSRC= ${WRKDIR}/gb2jis
+WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET=
-MAN1= gb2jis.1
-MANCOMPRESSED= yes
-
-post-install:
-# install manual
- @${GZIP_CMD} ${PREFIX}/man/man1/gb2jis.1
+MAN1= ${PORTNAME}.1
.include <bsd.port.mk>
diff --git a/chinese/gb2jis/files/patch-aa b/chinese/gb2jis/files/patch-Makefile
index f3a5a0a61403..08f19144dcd3 100644
--- a/chinese/gb2jis/files/patch-aa
+++ b/chinese/gb2jis/files/patch-Makefile
@@ -1,16 +1,18 @@
---- Makefile.orig Wed Feb 8 20:29:35 1995
-+++ Makefile Sun Oct 19 01:23:52 2003
-@@ -1,6 +1,8 @@
+--- ./Makefile.orig 1995-02-09 06:29:35.000000000 +0200
++++ ./Makefile 2009-06-01 18:28:52.173974060 +0300
+@@ -1,6 +1,10 @@
SHELL = /bin/sh
-CFLAGS = -O -DUNDEFCHAR=0xa2a2
+CC ?= cc
+CFLAGS ?= -O -pipe
+CFLAGS += -DUNDEFCHAR=0xa2a2
++MAN1PREFIX?= ${MANPREFIX}
++
TABLEC = GB2312JX0208.c GB2312JX0212.c GB2312UZPJ.c
TABLEO = GB2312JX0208.o GB2312JX0212.o GB2312UZPJ.o
-@@ -11,19 +13,20 @@
+@@ -11,19 +15,20 @@
./t2c $< $@
.c.o:
@@ -28,13 +30,15 @@
strip gb2jis
install: gb2jis gb2jis.1
- cp gb2jis /usr/local/bin/gb2jis
- cp gb2jis.1 /usr/local/man/man1/gb2jis.1
-+ cp gb2jis.el /usr/local/share/emacs/site-lisp/gb2jis.el
+- cp gb2jis /usr/local/bin/gb2jis
+- cp gb2jis.1 /usr/local/man/man1/gb2jis.1
++ ${BSD_INSTALL_PROGRAM} gb2jis ${PREFIX}/bin/gb2jis
++ ${BSD_INSTALL_MAN} gb2jis.1 ${MAN1PREFIX}/man/man1/gb2jis.1
++ ${BSD_INSTALL_DATA} gb2jis.el ${PREFIX}/share/emacs/site-lisp/gb2jis.el
# nroff -man gb2jis.1 > /usr/local/catman/C/u_man/cat1/gb2jis.1
clean:
-@@ -34,7 +37,7 @@
+@@ -34,7 +39,7 @@
-egrep '0x([2-9].[8-f]|[8-f].[2-9])' GB2312UZPJ.c
t2c: t2c.c