summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--print/dvipsk/Makefile38
-rw-r--r--print/dvipsk/PLIST4
-rw-r--r--print/dvipsk/distinfo11
-rw-r--r--print/dvipsk/patches/patch-aa21
-rw-r--r--print/dvipsk/patches/patch-ab42
5 files changed, 29 insertions, 87 deletions
diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile
index 1cef3eea3fd..7c378f0deae 100644
--- a/print/dvipsk/Makefile
+++ b/print/dvipsk/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2009/06/09 21:31:04 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/16 03:47:31 minskim Exp $
-DISTNAME= texlive-20080816-source
-PKGNAME= dvipsk-5.97
-PKGREVISION= 2
+DISTNAME= texlive-20091011-source
+PKGNAME= dvipsk-5.98
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX= .tar.lzma
+EXTRACT_SUFX= .tar.xz
MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://www.radicaleye.com/dvips.html
@@ -14,12 +13,10 @@ COMMENT= DVI-to-PostScript translator
CONFLICTS+= teTeX-bin<3.0nb24
CONFLICTS+= teTeX-texmf<3.0nb9
BUILD_DEPENDS+= texlive-tetex-[0-9]*:../../print/texlive-tetex
-DEPENDS+= tex-bin-dvipsk-[0-9]*:../../print/tex-bin-dvipsk
+DEPENDS+= tex-dvips>=2009.16376:../../print/tex-dvips
-EXTRACT_ELEMENTS= ${DISTNAME}/texk/dvipsk \
- ${DISTNAME}/texk/make \
- ${DISTNAME}/texk/install.sh \
- ${DISTNAME}/texk/mkinstalldirs
+EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
+ ${DISTNAME}/texk/dvipsk
PKG_DESTDIR_SUPPORT= user-destdir
@@ -28,18 +25,9 @@ INFO_FILES= yes
USE_LIBTOOL= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/texk/dvipsk
-FIND_PREFIX:= TETEX_PREFIX=texlive-tetex BIN_DVIPSK_PREFIX=tex-bin-dvipsk
-.include "../../mk/find-prefix.mk"
-
-MAKE_ENV+= KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} \
- kpathsea_parent=${BUILDLINK_PREFIX.kpathsea}/include \
- kpathsea_srcdir=${BUILDLINK_PREFIX.kpathsea}/include/kpathsea \
- kpathsea=${BUILDLINK_PREFIX.kpathsea}/lib/libkpathsea.la
-
-INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
- infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
- mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+= --with-system-kpathsea \
+ --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+ --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
PKG_SYSCONFSUBDIR= texmf
@@ -62,12 +50,12 @@ TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf-dist
post-build:
${MKDIR} -p ${WRKSRC}/texmf/dvips/config
- ${CP} ${BIN_DVIPSK_PREFIX}/share/texmf/dvips/config/config.ps \
+ ${CP} ${LOCALBASE}/share/texmf/dvips/config/config.ps \
${WRKSRC}/texmf/dvips/config
- env TEXMFCONFIG=${BIN_DVIPSK_PREFIX}/share/texmf \
+ env TEXMFCONFIG=${LOCALBASE}/share/texmf \
TFC_TEXMFCONFIG=${WRKSRC}/texmf \
configPsFile=${WRKSRC}/config.ps \
- ${TETEX_PREFIX}/bin/texconfig dvips paper ${LOWER_PAPERSIZE}
+ ${LOCALBASE}/bin/texconfig dvips paper ${LOWER_PAPERSIZE}
post-install:
${INSTALL_DATA} ${WRKSRC}/texmf/dvips/config/config.ps \
diff --git a/print/dvipsk/PLIST b/print/dvipsk/PLIST
index 29deb3bbb42..4f35c7cd1c4 100644
--- a/print/dvipsk/PLIST
+++ b/print/dvipsk/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/17 19:10:49 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/01/16 03:47:31 minskim Exp $
bin/afm2tfm
bin/dvips
-bin/odvips
info/dvips.info
man/man1/afm2tfm.1
man/man1/dvips.1
-man/man1/odvips.1
share/texmf-dist/dvips/config/config.ps
share/texmf/dvips/base/color.pro
share/texmf/dvips/base/crop.pro
diff --git a/print/dvipsk/distinfo b/print/dvipsk/distinfo
index 45b22459ef5..7aed89d00e2 100644
--- a/print/dvipsk/distinfo
+++ b/print/dvipsk/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/07/15 18:56:44 roy Exp $
+$NetBSD: distinfo,v 1.3 2010/01/16 03:47:31 minskim Exp $
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = dc2c5ff745a3c73aebb9f16c2b5f525195f4026a
-SHA1 (patch-ab) = 809e12301d9fc261b3d6e24174c3628ef788fe80
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
+SHA1 (patch-aa) = 825b091fecb17e8cc9135a0341b90e49ffd56baf
diff --git a/print/dvipsk/patches/patch-aa b/print/dvipsk/patches/patch-aa
index 2d8ad9a33d0..2d18fe14958 100644
--- a/print/dvipsk/patches/patch-aa
+++ b/print/dvipsk/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/17 19:10:49 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/16 03:47:31 minskim Exp $
-Use the kpathsea library in print/kpathsea.
-
---- Makefile.in.orig 2008-04-29 15:40:29.000000000 -0700
+--- Makefile.in.orig 2009-06-23 02:46:14.000000000 -0700
+++ Makefile.in
-@@ -66,7 +66,6 @@ $(prologues): squeeze
- texc.lpro: texc.script tex.lpro
- $(SHELL) $(srcdir)/texc.script $(srcdir)/tex.lpro $@
-
--kpse_include ../make/tkpathsea.mk
+@@ -376,7 +376,7 @@ dist_prologues = \
+ tex.lpro \
+ texps.lpro
- # The environment for running check.
- # No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain
+-prologdir = ${prefix}/texmf/dvips/base
++prologdir = ${prefix}/share/texmf/dvips/base
+ prologues = $(dist_prologues:.lpro=.pro) texc.pro
+ SUFFIXES = .pro .lpro
+ EXTRA_DIST = $(dist_prologues) texc.script dvips.test pfbincl.test \
diff --git a/print/dvipsk/patches/patch-ab b/print/dvipsk/patches/patch-ab
deleted file mode 100644
index 4b26418c855..00000000000
--- a/print/dvipsk/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/07/15 18:56:44 roy Exp $
-
-Rename getline to texlive_getline to avoid conflict with system getline.
-
---- afm2tfm.c.orig 2009-07-15 19:52:45.000000000 +0100
-+++ afm2tfm.c 2009-07-15 19:54:08.000000000 +0100
-@@ -260,7 +260,7 @@
- }
-
- int
--getline P1H(void) {
-+texlive_getline P1H(void) {
- register char *p ;
- register int c ;
-
-@@ -615,7 +615,7 @@
- ai = newchar() ;
- ai->adobenum = -1 ;
- ai->adobename = "||" ; /* boundary character name */
-- while (getline()) {
-+ while (texlive_getline()) {
- switch(interest(paramstring())) {
- case FontName:
- fontname = paramnewstring() ;
-@@ -1891,7 +1891,7 @@
-
- while (1) {
- while (param == 0 || *param == 0) {
-- if (getline() == 0)
-+ if (texlive_getline() == 0)
- error("! premature end in encoding file") ;
- for (p=buffer; *p; p++)
- if (*p == '%') {
-@@ -1982,7 +1982,7 @@
- p = gettoken() ;
- if (strcmp(p, "]"))
- error("! token 258 in encoding must be make-array (])") ;
-- while (getline()) {
-+ while (texlive_getline()) {
- for (p=buffer; *p; p++)
- if (*p == '%') {
- if (ignoreligkern == 0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 12:12:41 +0000