Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jan 2024 14:10:56 GMT
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d4fc766d2256 - main - chinese/jis2gb: Eliminate MAN*PREFIX usage
Message-ID:  <202401111410.40BEAuBu082399@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga:

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

commit d4fc766d2256cac3f90ec72b6f816485c6da689a
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-01-11 14:10:17 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-01-11 14:10:17 +0000

    chinese/jis2gb: Eliminate MAN*PREFIX usage
    
    While here, move manpages to share/man
---
 chinese/jis2gb/Makefile             |  3 +--
 chinese/jis2gb/files/patch-Makefile | 14 ++++++--------
 chinese/jis2gb/pkg-plist            |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/chinese/jis2gb/Makefile b/chinese/jis2gb/Makefile
index 443af2b2e839..0d451c110851 100644
--- a/chinese/jis2gb/Makefile
+++ b/chinese/jis2gb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	jis2gb
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	chinese
 MASTER_SITES=	http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/program/
 DISTFILES=	jis2gb.tar.Z
@@ -10,6 +11,4 @@ COMMENT=	Convert JIS Kanji to GuoBiao Hanzi
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=
 
-#MAN1=		${PORTNAME}.1
-
 .include <bsd.port.mk>
diff --git a/chinese/jis2gb/files/patch-Makefile b/chinese/jis2gb/files/patch-Makefile
index 0fa4a8312ace..8893a3586721 100644
--- a/chinese/jis2gb/files/patch-Makefile
+++ b/chinese/jis2gb/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	1995-10-05 16:21:32.000000000 +0800
-+++ Makefile	2013-09-26 21:15:32.000000000 +0800
-@@ -1,6 +1,11 @@
+--- Makefile.orig	1995-10-05 08:21:32 UTC
++++ Makefile
+@@ -1,6 +1,9 @@ SHELL = /bin/sh
  SHELL = /bin/sh
  
 -CFLAGS = -O -DUNDEFCHAR=0xa1f5
@@ -8,12 +8,10 @@
 +CFLAGS?=	-O -pipe
 +CFLAGS+=	-DUNDEFCHAR=0xa1f5
 +PREFIX?=	/usr/local	
-+MANPREFIX?=	${PREFIX}
-+MAN1PREFIX?=	${MANPREFIX}
  
  TABLEC = JX0208GB2312.c JX0208GB8565.c JX0212GB2312.c JX0212GB8565.c \
  	 MSSJISGB2312.c MSSJISJX0208.c MSSJISJX0212.c
-@@ -13,19 +18,20 @@ TABLEO = JX0208GB2312.o JX0208GB8565.o J
+@@ -13,19 +16,20 @@ TABLEO = JX0208GB2312.o JX0208GB8565.o JX0212GB2312.o 
  	./t2c $< $@
  
  .c.o:
@@ -35,12 +33,12 @@
 -	cp jis2gb /usr/local/bin/jis2gb
 -	cp jis2gb.1 /usr/local/man/man1/jis2gb.1
 +	${BSD_INSTALL_PROGRAM} jis2gb ${DESTDIR}${PREFIX}/bin/jis2gb
-+	${BSD_INSTALL_MAN} jis2gb.1 ${DESTDIR}${MAN1PREFIX}/man/man1/jis2gb.1
++	${BSD_INSTALL_MAN} jis2gb.1 ${DESTDIR}${PREFIX}/share/man/man1/jis2gb.1
 +	${BSD_INSTALL_DATA} jis2gb.el ${DESTDIR}${PREFIX}/share/emacs/site-lisp/jis2gb.el
  #	nroff -man jis2gb.1 > /usr/local/catman/C/u_man/cat1/jis2gb.1
  
  clean:
-@@ -36,7 +42,7 @@ check: $(TABLEC)
+@@ -36,7 +40,7 @@ t2c: t2c.c
  	-egrep '0x([2-9]|a[1-b]|f[0-9]|..[2-9])' JX0208GB8565.c JX0212GB8565.c
  
  t2c: t2c.c
diff --git a/chinese/jis2gb/pkg-plist b/chinese/jis2gb/pkg-plist
index 7bb7fee3d09c..747e2f5b2275 100644
--- a/chinese/jis2gb/pkg-plist
+++ b/chinese/jis2gb/pkg-plist
@@ -1,3 +1,3 @@
 bin/jis2gb
-man/man1/jis2gb.1.gz
+share/man/man1/jis2gb.1.gz
 share/emacs/site-lisp/jis2gb.el



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