Split xetex from web2c to reduce dependencies.

xetex will be imported as a separate package.

4 files changed, 7 insertions, 39 deletions

diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 55983ea6a07..23635838273 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/04/11 19:54:42 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/11 21:32:46 minskim Exp $
 
 DISTNAME=	texlive-20080816-source
 PKGNAME=	web2c-7.5.7
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.lzma
@@ -13,7 +14,6 @@ COMMENT=	TeX implementation translating WEB to C
 CONFLICTS+=	teTeX-bin-[0-9]*
 
 EXTRACT_ELEMENTS=	${DISTNAME}/config \
-			${DISTNAME}/libs/icu-xetex \
 			${DISTNAME}/libs/lua51 \
 			${DISTNAME}/libs/luafilesystem \
 			${DISTNAME}/libs/luafontforge \
@@ -40,11 +40,8 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake lex perl yacc
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/web2c
 
+CONFIGURE_ARGS+=	--without-xetex
 CONFIGURE_ARGS+=	--with-mf-nowin
-CONFIGURE_ARGS+=	--with-system-freetype2 \
-			--with-freetype2-include=${BUILDLINK_PREFIX.freetype2}/include \
-			--with-freetype2-libdir=${BUILDLINK_PREFIX.freetype2}/lib
-CONFIGURE_ARGS+=	--with-fontconfig=${BUILDLINK_PREFIX.fontconfig}
 CONFIGURE_ARGS+=	--with-system-pnglib \
 			--with-pnglib-include=${BUILDLINK_PREFIX.png}/include \
 			--with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
@@ -53,33 +50,19 @@ CONFIGURE_ARGS+=	--with-system-zlib \
 			--with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=	--enable-static
 
-CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}/libs/icu-xetex \
-		${WRKDIR}/${DISTNAME}/libs/xpdf \
+CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}/libs/xpdf \
 		${WRKDIR}/${DISTNAME}/libs/obsdcompat \
 		${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=	${WRKDIR}/${DISTNAME}/texk/web2c
 
 MAKE_ENV+=	KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
 MAKE_FLAGS+=	LIBTOOL=${LIBTOOL:Q}
-MAKE_FLAGS+=	TECKITFLAGS=-I${BUILDLINK_PREFIX.TECkit}/include/teckit \
-		LDTECKIT="-L${BUILDLINK_PREFIX.TECkit}/lib -lTECkit" \
-		TECKITDEP="" \
-		GRAPHITESRCDIR=${BUILDLINK_PREFIX.silgraphite} \
-		LDGRAPHITE="-L${BUILDLINK_PREFIX.silgraphite}/lib -lgraphite" \
-		GRAPHITEDEP="" \
-		ZZIPLIBSRCDIR="" \
+MAKE_FLAGS+=	ZZIPLIBSRCDIR="" \
 		ZZIPLIBDEP=${BUILDLINK_PREFIX.zziplib}/lib/libzzip.la
 
-FILES_SUBST+=	KPSEWHICH=${BUILDLINK_PREFIX.kpathsea}/bin/kpsewhich \
-		MKTEXLSR=${BUILDLINK_PREFIX.kpathsea}/bin/mktexlsr
-
 .include "../../archivers/zziplib/buildlink3.mk"
-.include "../../converters/TECkit/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/silgraphite/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
 
 post-install:
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index b515a52fc75..501d393018e 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/11 21:32:46 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
@@ -50,7 +50,6 @@ bin/ttf2afm
 bin/vftovp
 bin/vptovf
 bin/weave
-bin/xetex
 info/web2c.info
 man/man1/bibtex.1
 man/man1/ctangle.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 0e0158e191e..4d86e42561b 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/04/11 21:32:46 minskim Exp $
 
 SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
 RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
@@ -13,7 +13,6 @@ SHA1 (patch-ag) = d04526f55500e13757acd9e2a320b2c6737edd3b
 SHA1 (patch-ah) = b518352ae6b2839b2790550b422f1c2860821350
 SHA1 (patch-ai) = 85d011bd5023ea6ef984836d49d7b8d439ce725a
 SHA1 (patch-aj) = 986cae97bbe29164ab0e5ab2b0f9dc9d7c6f8e10
-SHA1 (patch-ak) = 83f2a49f6ee2ceca164940a194e8d559553c7c2e
 SHA1 (patch-al) = b8fc7bad60bffac60a48dccc63af2b9b736b84f0
 SHA1 (patch-am) = fbca2d97fe693b6d964f596e79908680a6e03965
 SHA1 (patch-an) = e2cb5013c035fd9d3ec288af37b7c4f40c6648eb
diff --git a/print/web2c/patches/patch-ak b/print/web2c/patches/patch-ak
deleted file mode 100644
index 07a50b57d67..00000000000
--- a/print/web2c/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../../libs/icu-xetex/Makefile.in.orig	2008-03-04 05:26:36.000000000 -0800
-+++ ../../libs/icu-xetex/Makefile.in
-@@ -179,7 +179,7 @@ $(top_builddir)/config/Makefile.inc: $(s
- 
- $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
- 	-$(RMV) $@
--	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
-+	cp $(top_srcdir)/config/icu-config-top $@
- 	chmod u+w $@
- 	@echo "# Following from @platform_make_fragment@" >> $@
- 	sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@