diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-01-29 21:43:34 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-01-29 21:43:34 +0000 |
commit | 0558b5a93e5e1c30036bdf3bfdc70f7c97abcaeb (patch) | |
tree | 6216fb3a47c5c33643c7aa5ebc863d29683a132a /textproc | |
parent | 7802dd13ca0591a045f19eb1ac73725ae05385f2 (diff) | |
download | pkgsrc-0558b5a93e5e1c30036bdf3bfdc70f7c97abcaeb.tar.gz |
Use textproc/xmlcatmgr/catalogs.mk to register the installed catalog file,
with the SGML_CATALOGS variable.
Also set the default catalog to be SGML_DEFAULT_CATALOG. Bump PKGREVISION.
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/sp/Makefile | 12 | ||||
-rw-r--r-- | textproc/sp/PLIST | 4 | ||||
-rw-r--r-- | textproc/sp/distinfo | 4 | ||||
-rw-r--r-- | textproc/sp/patches/patch-aa | 4 |
4 files changed, 11 insertions, 13 deletions
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index 0743804a83c..dfa47a13cdf 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2003/01/19 10:24:18 salo Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/29 21:43:34 jmmv Exp $ # DISTNAME= sp-1.3.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.jclark.com/pub/sp/ \ ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/sp/ \ @@ -21,15 +21,15 @@ CONFLICTS+= opensp-[0-9]* USE_BUILDLINK2= YES -MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" +MAKE_ENV+= SGML_DEFAULT_CATALOG="${SGML_DEFAULT_CATALOG}" + +SGML_CATALOGS= ${PREFIX}/share/sgml/dtd/html.soc post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a - ${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \ - CATALOG ${PREFIX}/share/sgml/dtd/html.soc .include "../../mk/bsd.prefs.mk" @@ -43,5 +43,5 @@ post-patch: done .endif -.include "../../textproc/xmlcatmgr/buildlink2.mk" +.include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/sp/PLIST b/textproc/sp/PLIST index 9099c1211dc..bfb5a8be2bd 100644 --- a/textproc/sp/PLIST +++ b/textproc/sp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/01/11 22:08:42 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/29 21:43:34 jmmv Exp $ bin/nsgmls bin/sx bin/spam @@ -45,8 +45,6 @@ share/sgml/dtd/html.dtd share/sgml/dtd/html.soc share/sgml/dtd/xml.dcl share/sgml/dtd/xml.soc -@exec ${LOCALBASE}/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/dtd/html.soc -@unexec ${LOCALBASE}/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/dtd/html.soc @dirrm share/sgml/dtd @comment in xmlcatmgr: @dirrm share/sgml @dirrm share/doc/sp diff --git a/textproc/sp/distinfo b/textproc/sp/distinfo index c06308514cc..7c77d8fc757 100644 --- a/textproc/sp/distinfo +++ b/textproc/sp/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2003/01/19 10:24:19 salo Exp $ +$NetBSD: distinfo,v 1.5 2003/01/29 21:43:34 jmmv Exp $ SHA1 (sp-1.3.4.tar.gz) = e71e96356b4bba269d01b6761d4ae33b4f291377 Size (sp-1.3.4.tar.gz) = 597801 bytes -SHA1 (patch-aa) = 0ed837efae8b909fe4e034596e405d89b069ba43 +SHA1 (patch-aa) = 006734b5612abfa5c909bc721b6ffb6de1ca6734 SHA1 (patch-ac) = 012f14a4640db95a1d3708682de04d0d18fae97e SHA1 (patch-ad) = 4a8f06ac288cf22616825fbcbed2e047fd6bcf5a diff --git a/textproc/sp/patches/patch-aa b/textproc/sp/patches/patch-aa index 7f39ca1b0bb..0f8d5507898 100644 --- a/textproc/sp/patches/patch-aa +++ b/textproc/sp/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2003/01/19 10:24:19 salo Exp $ +$NetBSD: patch-aa,v 1.6 2003/01/29 21:43:35 jmmv Exp $ --- Makefile.orig Sat Oct 10 06:15:02 1998 +++ Makefile Thu Dec 16 22:42:56 1999 @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.5 2003/01/19 10:24:19 salo Exp $ # Add -DJADE_MIF to include the Jade MIF backend XDEFINES= -DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES) -+DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES) -DSGML_CATALOG_FILES_DEFAULT=\"${PKG_SYSCONFDIR}/catalog\" -DSP_HAVE_LOCALE ++DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES) -DSGML_CATALOG_FILES_DEFAULT=\"${SGML_DEFAULT_CATALOG}\" -DSP_HAVE_LOCALE CXXFLAGS=-ansi $(DEBUG) $(WARN) # Flag to pass to CXX to make it output list of dependencies as a Makefile. CXXDEPGENFLAGS=-MM |