git: 3f267107ad06 - main - chinese/gb2jis: Eliminate MAN*PREFIX usage

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Renato Botelho <garga_at_FreeBSD.org>
Date: Thu, 11 Jan 2024 14:10:55 UTC
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f267107ad06288d3472c361df94ba9c7e2f4dec

commit 3f267107ad06288d3472c361df94ba9c7e2f4dec
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-01-11 14:09:34 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-01-11 14:09:34 +0000

    chinese/gb2jis: Eliminate MAN*PREFIX usage
    
    While here, move manpages to share/man
---
 chinese/gb2jis/Makefile             |  1 +
 chinese/gb2jis/files/patch-Makefile | 16 ++++++++--------
 chinese/gb2jis/pkg-plist            |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/chinese/gb2jis/Makefile b/chinese/gb2jis/Makefile
index 2fcaad3707e3..c3aedc548610 100644
--- a/chinese/gb2jis/Makefile
+++ b/chinese/gb2jis/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gb2jis
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/program/
 DISTFILES=	${PORTNAME}.tar.Z
diff --git a/chinese/gb2jis/files/patch-Makefile b/chinese/gb2jis/files/patch-Makefile
index 816ec565428f..eca64bf0d680 100644
--- a/chinese/gb2jis/files/patch-Makefile
+++ b/chinese/gb2jis/files/patch-Makefile
@@ -1,18 +1,18 @@
---- Makefile.orig	1995-02-09 12:29:35.000000000 +0800
-+++ Makefile	2013-09-26 20:13:01.000000000 +0800
-@@ -1,6 +1,10 @@
+--- Makefile.orig	1995-02-09 04:29:35 UTC
++++ Makefile
+@@ -1,7 +1,10 @@ SHELL = /bin/sh
  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 +15,20 @@ TABLEO = GB2312JX0208.o GB2312JX0212.o G
+ 
+@@ -11,19 +14,20 @@ TABLEO = GB2312JX0208.o GB2312JX0212.o GB2312UZPJ.o
  	./t2c $< $@
  
  .c.o:
@@ -33,12 +33,12 @@
 -	cp gb2jis /usr/local/bin/gb2jis
 -	cp gb2jis.1 /usr/local/man/man1/gb2jis.1
 +	${BSD_INSTALL_PROGRAM} gb2jis ${DESTDIR}${PREFIX}/bin/gb2jis
-+	${BSD_INSTALL_MAN} gb2jis.1 ${DESTDIR}${MAN1PREFIX}/man/man1/gb2jis.1
++	${BSD_INSTALL_MAN} gb2jis.1 ${DESTDIR}${PREFIX}/share/man/man1/gb2jis.1
 +	${BSD_INSTALL_DATA} gb2jis.el ${DESTDIR}${PREFIX}/share/emacs/site-lisp/gb2jis.el
  #	nroff -man gb2jis.1 > /usr/local/catman/C/u_man/cat1/gb2jis.1
  
  clean:
-@@ -34,7 +39,7 @@ check: $(TABLEC)
+@@ -34,7 +38,7 @@ t2c: t2c.c
  	-egrep '0x([2-9].[8-f]|[8-f].[2-9])' GB2312UZPJ.c
  
  t2c: t2c.c
diff --git a/chinese/gb2jis/pkg-plist b/chinese/gb2jis/pkg-plist
index dc710deceb5b..90eb21f0f2d8 100644
--- a/chinese/gb2jis/pkg-plist
+++ b/chinese/gb2jis/pkg-plist
@@ -1,3 +1,3 @@
 bin/gb2jis
-man/man1/gb2jis.1.gz
+share/man/man1/gb2jis.1.gz
 share/emacs/site-lisp/gb2jis.el