7 files changed, 70 insertions, 71 deletions

diff --git a/japanese/mendexk-euc/Makefile b/japanese/mendexk-euc/Makefile
index c2753f47a9a5..4ba972001dc9 100644
--- a/japanese/mendexk-euc/Makefile
+++ b/japanese/mendexk-euc/Makefile
@@ -6,58 +6,57 @@
 #
 
 PORTNAME=	mendexk
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6c
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/
-PKGNAMESUFFIX=	-${KANJICODE}
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/:1 \
+		${MASTER_SITE_TEX_CTAN}
+DISTFILES=	${PORTNAME}${PORTVERSION}${EXTRACT_SUFX}:1 \
+		${TETEX_SRC}${EXTRACT_SUFX}
+DIST_SUBDIR=	teTeX
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Index formatter for Japanese
 
-KANJICODE?=	euc
-
-EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/japanese/ptex-base:configure
-.if ${KANJICODE} == "sjis"
-EXTRACT_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
-.endif
-
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${KANJICODE}
+CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 USE_GMAKE=	yes
-DIST_SUBDIR=	teTeX
-WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/tetex-src-${TETEX_VERSION}/texk/${DISTNAME}
 ALL_TARGET=	mendex
-
-TETEX_VERSION=	2.0.2
-KANJI_FILES=	kana.h ktable.h
-
-MANLANG=	ja
 MAN1=		mendex.1
+MANLANG=	ja
 
-post-extract:
-	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${DISTNAME} ${WRKSRC}
-.if ${KANJICODE} == "sjis"
-	@( cd ${WRKSRC} ; \
-	    for i in ${KANJI_FILES}; do \
-	      ${MV} $$i $$i.orig ; \
-	      nkf -s $$i.orig > $$i ; \
-	    done )
-.endif
+WRKSRC=		${WRKSRC_TETEX}/texk/${PORTNAME}${PORTVERSION}
+WRKSRC_MENDEX=	${WRKDIR}/${PORTNAME}${PORTVERSION}
+WRKSRC_TETEX=	${WRKDIR}/${TETEX_SRC}
+TETEX_SRC=	tetex-src-3.0
 
-pre-build:
-	@(cd ${WRKSRC}/../kpathsea; ${MAKE})
+KANJICODE?=	EUC
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mendex ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/man/${MANLANG}/man1
-	@${INSTALL_MAN} ${WRKSRC}/mendex.1 ${PREFIX}/man/${MANLANG}/man1
+post-extract:
+	${MV} ${WRKSRC_MENDEX} ${WRKSRC_TETEX}/texk
+
+pre-configure:
+	cd ${WRKSRC_TETEX} && \
+		${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \
+			--prefix=${PREFIX} \
+			--disable-multiplatform \
+			--without-texinfo --without-dialog \
+			--with-system-ncurses --with-system-zlib \
+			--without-xdvik --without-oxdvik \
+			--without-dvipsk --without-odvipsk \
+			--without-x11 --without-dvipdfm \
+			--without-pdftex --without-pdfetex --without-pdfxtex \
+			--without-omega --without-eomega \
+			--without-etex
+	cd ${WRKSRC}/../kpathsea && ${SETENV} ${MAKE_ENV} ${MAKE}
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-pre-clean:
-	@${RM} -rf ${WRKSRC}
-
 .include <bsd.port.mk>
diff --git a/japanese/mendexk-euc/distinfo b/japanese/mendexk-euc/distinfo
index 5345c418ec73..d4befbc87c06 100644
--- a/japanese/mendexk-euc/distinfo
+++ b/japanese/mendexk-euc/distinfo
@@ -1,2 +1,4 @@
-MD5 (teTeX/mendexk2.5.tar.gz) = 055a239a389711ede327438677f0ed95
-SIZE (teTeX/mendexk2.5.tar.gz) = 25850
+MD5 (teTeX/mendexk2.6c.tar.gz) = d81ae00ade26159eecc51fc798c2165e
+SIZE (teTeX/mendexk2.6c.tar.gz) = 28110
+MD5 (teTeX/tetex-src-3.0.tar.gz) = 944a4641e79e61043fdaf8f38ecbb4b3
+SIZE (teTeX/tetex-src-3.0.tar.gz) = 12749314
diff --git a/japanese/mendexk-euc/files/patch-Makefile.in b/japanese/mendexk-euc/files/patch-Makefile.in
new file mode 100644
index 000000000000..026cc443b130
--- /dev/null
+++ b/japanese/mendexk-euc/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Sun Sep 11 06:23:12 2005
++++ Makefile.in	Sun Sep 11 06:25:21 2005
+@@ -28,7 +28,8 @@
+ kp.o: kp.c kp.h
+ 
+ install:	$(PROGRAM)
+-	install -m 755 $? $(bindir)
++	${INSTALL_PROGRAM} ${PROGRAM} $(bindir)
++	${INSTALL_MAN} ${PROGRAM}.1 ${PREFIX}/man/ja/man1
+ 
+ clean:
+ 	rm -f *.o mendex
diff --git a/japanese/mendexk-euc/files/patch-aa b/japanese/mendexk-euc/files/patch-aa
deleted file mode 100644
index e13684719543..000000000000
--- a/japanese/mendexk-euc/files/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	Mon Jan 21 15:12:48 2002
-+++ Makefile	Mon Jun 23 16:17:52 2003
-@@ -1,4 +1,3 @@
--CC = gcc
- CCLD =$(CC)
- PROGRAM = mendex
- 
-@@ -9,16 +8,16 @@
- # CFLAGS と PROGLINK を kpathsea ライブラリに合わせて選択する
- #
- # for kpathsea-3.*
--#CFLAGS = -O -DKPATHSEA -DKPATHSEA3
--#PROGLINK = $(kpathsea_link) $(OBJS) $(kpathsea_3)
-+CFLAGS = -O -DKPATHSEA -DKPATHSEA3
-+PROGLINK = $(kpathsea_link) $(OBJS) $(kpathsea_3)
- 
- # for kpathsea-2.6
- #CFLAGS = -O -DKPATHSEA
- #PROGLINK = $(CC) $(OBJS) -o $(PROGRAM) $(kpathsea_2)
- 
- # for no kpathsea
--CFLAGS = -O
--PROGLINK = $(CC) $(OBJS) -o $(PROGRAM)
-+#CFLAGS = -O
-+#PROGLINK = $(CC) $(OBJS) -o $(PROGRAM)
- 
- OBJS = main.o convert.o sort.o fread.o fwrite.o styfile.o pageread.o kp.o
- LIBTOOL =$(kpathsea_parent)/klibtool
diff --git a/japanese/mendexk-euc/files/patch-configure b/japanese/mendexk-euc/files/patch-configure
new file mode 100644
index 000000000000..575a20044466
--- /dev/null
+++ b/japanese/mendexk-euc/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Sun Sep 11 06:16:22 2005
++++ configure	Sun Sep 11 06:16:39 2005
+@@ -34,11 +34,11 @@
+ esac
+ 
+ # kpathseaライブラリチェック
+-if [ -f ../kpathsea/libkpathsea.la ]; then
++if [ -f ../kpathsea/.libs/libkpathsea.la ]; then
+ 	echo "s%@KFLAGS@%-DKPATHSEA -DKPATHSEA3%" >> $CONFIGSED ;
+ 	echo "s%@KPATHLINK@%\\\$(kpathsea_link)%" >> $CONFIGSED ;
+ 	echo "s%@LIBKPATHSEA@%../kpathsea/libkpathsea.la%" >> $CONFIGSED ;
+-elif [ -f ../kpathsea/kpathsea.a ]; then
++elif [ -f ../kpathsea/.libs/kpathsea.a ]; then
+     echo "s%@KFLAGS@%-DKPATHSEA%" >> $CONFIGSED ;
+ 	echo "s%@KPATHLINK@%\\\$(kpathsea_link)%" >> $CONFIGSED ;
+ 	echo "s%@LIBKPATHSEA@%../kpathsea/kpathsea.a%" >> $CONFIGSED ;
diff --git a/japanese/mendexk-euc/pkg-descr b/japanese/mendexk-euc/pkg-descr
index 1d725a95fc4c..47b9ded8bed5 100644
--- a/japanese/mendexk-euc/pkg-descr
+++ b/japanese/mendexk-euc/pkg-descr
@@ -1,5 +1,2 @@
 The program mendex is a index formatter for Japanese, has
 the compatibility with makeindex.
-
-- Makoto WATANABE
-watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/mendexk-euc/pkg-plist b/japanese/mendexk-euc/pkg-plist
index b9e27663b8af..9c6f6093eedd 100644
--- a/japanese/mendexk-euc/pkg-plist
+++ b/japanese/mendexk-euc/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/mendex
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%