git: 71e9a8a8383d - main - japanese/eb: Take maintainership

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kousuke Kannagi <mce_at_FreeBSD.org>
Date: Thu, 10 Sep 2026 08:10:21 UTC
The branch main has been updated by mce:

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

commit 71e9a8a8383d94fa895ded09d576a82a3f8d950e
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-10 00:39:13 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-10 08:04:57 +0000

    japanese/eb: Take maintainership
    
    Refactor Makefile.
    
    PR:             298323
    Approved by:    fluffy (mentor)
---
 japanese/eb/Makefile | 69 ++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 46 deletions(-)

diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index e543b997458a..a12a9da4d6b2 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -1,15 +1,14 @@
 PORTNAME=	eb
-PORTVERSION=	4.4.3
-PORTREVISION=	5
+DISTVERSION=	4.4.3
+PORTREVISION=	6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
-		ftp://ftp.sra.co.jp/pub/misc/eb/old/eb-${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}/
+MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=	${EBFILES} \
-		${APPENDIXFILES}
+		${APPENDIXFILES:S,^,appendix/,:S,$,.tar.gz,}
 DIST_SUBDIR=	eb
 EXTRACT_ONLY=	${EBFILES}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	C library for accessing EB, EBG, EBXA, and EPWING CD-ROM dictionaries
 
 LICENSE=	BSD3CLAUSE
@@ -18,66 +17,44 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		autoreconf iconv libtool perl5 tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-iconv-includes=${ICONV_PREFIX}/include \
-		--with-iconv-libraries=${ICONV_PREFIX}/lib \
-		--with-pkgdocdir=${DOCSDIR}
+CONFIGURE_ARGS=	--with-pkgdocdir=${DOCSDIR}
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
-PORTDOCS=	eb-01.html eb-02.html eb-03.html eb-04.html eb-05.html \
-		eb-06.html eb-07.html eb-08.html eb-09.html eb-10.html \
-		eb-11.html eb-12.html eb-13.html eb-14.html eb.html \
-		ebappendix-01.html ebappendix-02.html ebappendix-03.html \
-		ebappendix-04.html ebappendix.html ebfont-01.html \
-		ebfont-02.html ebfont-03.html ebfont-04.html ebfont.html \
-		ebinfo-01.html ebinfo-02.html ebinfo-03.html ebinfo-04.html \
-		ebinfo-05.html ebinfo.html ebrefile-01.html ebrefile-02.html \
-		ebrefile-03.html ebrefile.html ebstopcode-01.html \
-		ebstopcode-02.html ebstopcode-03.html ebstopcode.html \
-		ebzip-01.html ebzip-02.html ebzip-03.html ebzip-04.html \
-		ebzip-05.html ebzip-06.html ebzip-07.html ebzip-08.html \
-		ebzip-09.html ebzip-10.html ebzip.html
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-APPENDIXDIR=	${DATADIR}/appendix
-
 NLS_USES=		gettext
 NLS_CONFIGURE_ON=	--with-gettext-includes=${LOCALBASE}/include \
 			--with-gettext-libraries=${LOCALBASE}/lib
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_CONFIGURE_ENABLE=	nls
 
+EBDOCS=		eb ebappendix ebfont ebinfo ebrefile ebstopcode ebzip
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
-APPENDIXFILES=	appendix/cencro-1.0.tar.gz appendix/chujiten-2.3.tar.gz \
-		appendix/chujiten2-2.0.tar.gz appendix/chujiten6-2.3.tar.gz \
-		appendix/colloc-2.0.tar.gz appendix/crownfj-2.0.tar.gz \
-		appendix/crownfj2-1.0.tar.gz appendix/crowngj-1.0.tar.gz \
-		appendix/daihyakka-1.0.tar.gz appendix/daijirin-2.0.tar.gz \
-		appendix/dd75-2.0.tar.gz appendix/gendai2000-1.0.tar.gz \
-		appendix/genius-1.0.tar.gz appendix/genius2-1.1.tar.gz \
-		appendix/global-2.0.tar.gz appendix/heritage-2.2.tar.gz \
-		appendix/hyogen-1.0.tar.gz appendix/izumi-2.0.tar.gz \
-		appendix/jitenban-2.4.tar.gz appendix/jitenban97-2.1.tar.gz \
-		appendix/kanjigen-2.0.tar.gz appendix/kanjigen2-2.0.tar.gz \
-		appendix/kojien-2.3.tar.gz appendix/kojien2-2.0.tar.gz \
-		appendix/kojien4-2.2.tar.gz appendix/oxford-2.0.tar.gz \
-		appendix/plus-2.0.tar.gz appendix/readers-2.2.tar.gz \
-		appendix/readers2-2.0.tar.gz appendix/ruigigo-1.0.tar.gz \
-		appendix/superdic98-1.0.tar.gz
+APPENDIXFILES=	cencro-1.0 chujiten-2.3 chujiten2-2.0 chujiten6-2.3 \
+		colloc-2.0 crownfj-2.0 crownfj2-1.0 crowngj-1.0 daihyakka-1.0 \
+		daijirin-2.0 dd75-2.0 gendai2000-1.0 genius-1.0 genius2-1.1 \
+		global-2.0 heritage-2.2 hyogen-1.0 izumi-2.0 jitenban-2.4 \
+		jitenban97-2.1 kanjigen-2.0 kanjigen2-2.0 kojien-2.3 \
+		kojien2-2.0 kojien4-2.2 oxford-2.0 plus-2.0 readers-2.2 \
+		readers2-2.0 ruigigo-1.0 superdic98-1.0
 
 post-extract:
-	${RM} -r ${WRKSRC}/zlib
-	${MKDIR} ${WRKDIR}/appendix
+	@${MKDIR} ${WRKDIR}/appendix
 .for file in ${APPENDIXFILES}
 	${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
-	${DISTDIR}/${DIST_SUBDIR}/${file}
+		${DISTDIR}/${DIST_SUBDIR}/appendix/${file}.tar.gz
 .endfor
 
 post-install:
-	(cd ${WRKDIR}/appendix && ${COPYTREE_SHARE} . ${STAGEDIR}${APPENDIXDIR} )
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} appendix ${STAGEDIR}${DATADIR})
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libeb.so
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${EBDOCS:S,$,.html,} \
+		${EBDOCS:S,$,-[01][0-9].html,} ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>