Date: Mon, 08 Jan 2007 05:46:47 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: kuriyama@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/107648: Man page not installed with package openjade-1.3.2_7 Message-ID: <20070108.054647.39193809.hrs@allbsd.org> In-Reply-To: <200701071115.l07BFYmR070004@freefall.freebsd.org> <200701070629.l076TD7D081749@www.freebsd.org> References: <200701071115.l07BFYmR070004@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Mon_Jan__8_05_46_47_2007_058)--
Content-Type: Multipart/Mixed;
boundary="--Next_Part(Mon_Jan__8_05_46_47_2007_009)--"
Content-Transfer-Encoding: 7bit
----Next_Part(Mon_Jan__8_05_46_47_2007_009)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Jason Lenthe<lenthe@comcast.net> wrote
in <200701070629.l076TD7D081749@www.freebsd.org>:
le> >Description:
le> Installing the package openjade-1.3.2_7 does not install the openjade.1 man page to /usr/local/man/man1 or anywhere else. The man page can be found under the source tree at openjade-1.3.2/docsrc.
le> >How-To-Repeat:
le> Install openjade-1.3.2_7 and type "man openjade".
I have a patch for updating openjade to 1.3.3pre1 including a fix for
the manual page installation issue pointed out in this PR. And the
textproc/opensp is out-of-date, so a patch to update it is also
attached (the latest openjade requires some newer opensp).
Changes include:
[opensp]
- Update to 1.5.2.
- Add WITHOUT_NLS support.
- Install doc files into the standard DOCSDIR only.
- Clean up Makefile to make portlint happy.
- Improvements since 1.5: translated .po files,
$SP_MESSAGE_FORMAT, HTTP redirection, $SP_HTTP_USER_AGENT,
$SP_HTTP_ACCEPT, and preserve case option in osx(1).
[openjade]
- Update to 1.3.3-pre1
- Install openjade(1) manual page.
- Fix a possible problem that prevents xmlcatmgr from
working during pkg_delete.
- Clean up Makefile to make portlint happy.
- Improvements since 1.3.2: the following flow objects added:
page-sequence
column-set-sequence
embedded-text
anchor
included-container-area
glyph-annotation
aligned-column
multi-line-inline-note
emphasizing-mark
side-by-side
side-by-side-item
--
| Hiroki SATO
----Next_Part(Mon_Jan__8_05_46_47_2007_009)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="opensp.diff"
Index: opensp/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/opensp/Makefile,v
retrieving revision 1.14
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.14 Makefile
--- opensp/Makefile 13 May 2006 04:24:47 -0000 1.14
+++ opensp/Makefile 7 Jan 2007 20:12:17 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= OpenSP
-PORTVERSION= 1.5
-PORTREVISION= 7
+PORTVERSION= 1.5.2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= openjade
@@ -16,28 +15,25 @@
COMMENT= This package is a collection of SGML/XML tools called OpenSP
USE_GETTEXT= yes
-USE_GMAKE= YES
+USE_GMAKE= yes
+USE_LDCONFIG= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
- --datadir=${PREFIX}/share/sgml/openjade
+ --datadir=${PREFIX}/share/sgml/openjade \
+ --disable-doc-build
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-INSTALLS_SHLIB= yes
-
-MAN1= onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1
-DOC_FILES= archform.htm autoconf.htm build.htm catalog.htm charset.htm \
- features.htm generic.htm ideas.htm index.htm new.htm \
- nsgmls.htm sgmldecl.htm sgmlnorm.htm sgmlsout.htm spam.htm \
- spcat.htm spent.htm sx.htm sysdecl.htm sysid.htm xml.htm \
- xmlwarn.htm
-DOC_FILES2= NEWS AUTHORS README \
- releasenotes.html releasenotes.pdf releasenotes.ps
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.else
+PLIST_SUB+= NLS=""
+.endif
-# Perhaps this better should be somewhere under ${PREFIX}/share/doc ?
-DOCSDIR2= ${PREFIX}/share/sgml/openjade/doc/OpenSP
+#MAN1= onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1
.include <bsd.port.pre.mk>
@@ -47,24 +43,17 @@
# other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
CPPFLAGS:= -O ${CFLAGS:N-O*:N-m*}
-pre-install:
- @${REINPLACE_CMD} -e \
- 's|install-man install-pkgdocDATA|install-man|g' \
- ${WRKSRC}/Makefile
-
post-install:
-
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
-.endfor
-
- @${MKDIR} ${DOCSDIR2}
-.for doc in ${DOC_FILES2}
- @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR2}
-.endfor
-
+ @${CAT} ${PLIST} | \
+ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \
+ ${AWK} '/^@comment INSTALL_DATA:/ \
+ {printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi; %s %s/%s %s/%s\n", \
+ $$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \
+ "${WRKSRC}", $$3, "${PREFIX}", $$4}' | \
+ ${SH} && \
+ ${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
.endif
.include <bsd.port.post.mk>
Index: opensp/distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/opensp/distinfo,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.3 distinfo
--- opensp/distinfo 24 Jan 2006 03:09:47 -0000 1.3
+++ opensp/distinfo 7 Jan 2007 12:06:20 -0000
@@ -1,3 +1,3 @@
-MD5 (OpenSP-1.5.tar.gz) = 87f56e79ae0c20397f4207d61d154303
-SHA256 (OpenSP-1.5.tar.gz) = 987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
-SIZE (OpenSP-1.5.tar.gz) = 1288057
+MD5 (OpenSP-1.5.2.tar.gz) = 670b223c5d12cee40c9137be86b6c39b
+SHA256 (OpenSP-1.5.2.tar.gz) = 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce
+SIZE (OpenSP-1.5.2.tar.gz) = 1521390
Index: opensp/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/opensp/pkg-plist,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.4 pkg-plist
--- opensp/pkg-plist 23 Feb 2006 10:39:28 -0000 1.4
+++ opensp/pkg-plist 7 Jan 2007 20:10:40 -0000
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
bin/onsgmls
bin/osgmlnorm
bin/ospam
@@ -141,33 +142,46 @@
include/OpenSP/sptchar.h
include/OpenSP/types.h
include/OpenSP/xnew.h
-lib/charset.alias
+@dirrm include/OpenSP
lib/libosp.a
lib/libosp.la
lib/libosp.so
-lib/libosp.so.3
-%%PORTDOCS%%%%DOCSDIR%%/archform.htm
-%%PORTDOCS%%%%DOCSDIR%%/autoconf.htm
-%%PORTDOCS%%%%DOCSDIR%%/build.htm
-%%PORTDOCS%%%%DOCSDIR%%/catalog.htm
-%%PORTDOCS%%%%DOCSDIR%%/charset.htm
-%%PORTDOCS%%%%DOCSDIR%%/features.htm
-%%PORTDOCS%%%%DOCSDIR%%/generic.htm
-%%PORTDOCS%%%%DOCSDIR%%/ideas.htm
-%%PORTDOCS%%%%DOCSDIR%%/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/new.htm
-%%PORTDOCS%%%%DOCSDIR%%/nsgmls.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmldecl.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmlnorm.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmlsout.htm
-%%PORTDOCS%%%%DOCSDIR%%/spam.htm
-%%PORTDOCS%%%%DOCSDIR%%/spcat.htm
-%%PORTDOCS%%%%DOCSDIR%%/spent.htm
-%%PORTDOCS%%%%DOCSDIR%%/sx.htm
-%%PORTDOCS%%%%DOCSDIR%%/sysdecl.htm
-%%PORTDOCS%%%%DOCSDIR%%/sysid.htm
-%%PORTDOCS%%%%DOCSDIR%%/xml.htm
-%%PORTDOCS%%%%DOCSDIR%%/xmlwarn.htm
+lib/libosp.so.5
+%%NLS%%share/locale/de/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/sp5.mo
+@comment the following lines used for installation of doc files
+@comment INSTALL_DATA: doc/archform.htm %%DOCSDIR%%/archform.htm
+@comment INSTALL_DATA: doc/autoconf.htm %%DOCSDIR%%/autoconf.htm
+@comment INSTALL_DATA: doc/build.htm %%DOCSDIR%%/build.htm
+@comment INSTALL_DATA: doc/catalog.htm %%DOCSDIR%%/catalog.htm
+@comment INSTALL_DATA: doc/charset.htm %%DOCSDIR%%/charset.htm
+@comment INSTALL_DATA: doc/features.htm %%DOCSDIR%%/features.htm
+@comment INSTALL_DATA: doc/generic.htm %%DOCSDIR%%/generic.htm
+@comment INSTALL_DATA: doc/ideas.htm %%DOCSDIR%%/ideas.htm
+@comment INSTALL_DATA: doc/index.htm %%DOCSDIR%%/index.htm
+@comment INSTALL_DATA: doc/new.htm %%DOCSDIR%%/new.htm
+@comment INSTALL_DATA: doc/nsgmls.htm %%DOCSDIR%%/nsgmls.htm
+@comment INSTALL_DATA: doc/sgmldecl.htm %%DOCSDIR%%/sgmldecl.htm
+@comment INSTALL_DATA: doc/sgmlnorm.htm %%DOCSDIR%%/sgmlnorm.htm
+@comment INSTALL_DATA: doc/sgmlsout.htm %%DOCSDIR%%/sgmlsout.htm
+@comment INSTALL_DATA: doc/spam.htm %%DOCSDIR%%/spam.htm
+@comment INSTALL_DATA: doc/spcat.htm %%DOCSDIR%%/spcat.htm
+@comment INSTALL_DATA: doc/spent.htm %%DOCSDIR%%/spent.htm
+@comment INSTALL_DATA: doc/sx.htm %%DOCSDIR%%/sx.htm
+@comment INSTALL_DATA: doc/sysdecl.htm %%DOCSDIR%%/sysdecl.htm
+@comment INSTALL_DATA: doc/sysid.htm %%DOCSDIR%%/sysid.htm
+@comment INSTALL_DATA: doc/xml.htm %%DOCSDIR%%/xml.htm
+@comment INSTALL_DATA: doc/xmlwarn.htm %%DOCSDIR%%/xmlwarn.htm
+@comment INSTALL_DATA: NEWS %%DOCSDIR%%/NEWS
+@comment INSTALL_DATA: AUTHORS %%DOCSDIR%%/AUTHORS
+@comment INSTALL_DATA: README %%DOCSDIR%%/README
+@comment INSTALL_DATA: ABOUT-NLS %%DOCSDIR%%/ABOUT-NLS
+@comment INSTALL_DATA: BUGS %%DOCSDIR%%/BUGS
+@comment INSTALL_DATA: COPYING %%DOCSDIR%%/COPYING
+@comment INSTALL_DATA: ChangeLog %%DOCSDIR%%/ChangeLog
share/sgml/openjade/OpenSP/HTML32.dcl
share/sgml/openjade/OpenSP/HTML32.dtd
share/sgml/openjade/OpenSP/HTML32.soc
@@ -196,17 +210,5 @@
share/sgml/openjade/OpenSP/unicode.syn
share/sgml/openjade/OpenSP/xml.dcl
share/sgml/openjade/OpenSP/xml.soc
-share/sgml/openjade/locale/locale.alias
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/AUTHORS
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/NEWS
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/README
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.html
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.pdf
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/OpenSP
-@dirrm share/sgml/openjade/locale
@dirrm share/sgml/openjade/OpenSP
-%%PORTDOCS%%@dirrm share/sgml/openjade/doc/OpenSP
-%%PORTDOCS%%@dirrm share/sgml/openjade/doc
@dirrm share/sgml/openjade
Index: opensp/files/patch-Attribute.h
===================================================================
RCS file: opensp/files/patch-Attribute.h
diff -N opensp/files/patch-Attribute.h
--- opensp/files/patch-Attribute.h 5 Aug 2003 03:24:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
---- include/Attribute.h.orig Fri Mar 10 03:30:56 2000
-+++ include/Attribute.h Tue Aug 5 11:49:19 2003
-@@ -25,12 +25,32 @@
- class Entity;
- class Notation;
- class DeclaredValue;
--class AttributeValue;
- class TokenizedAttributeValue;
- class AttributeSemantics;
- class AttributeContext;
- class Syntax;
-
-+class SP_API AttributeValue : public Resource {
-+public:
-+ enum Type {
-+ implied,
-+ cdata,
-+ tokenized
-+ };
-+ AttributeValue();
-+ virtual ~AttributeValue();
-+ virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
-+ AttributeContext &,
-+ const StringC &,
-+ unsigned &,
-+ unsigned &) const;
-+ virtual Type info(const Text *&, const StringC *&) const = 0;
-+ virtual const Text *text() const;
-+ virtual Boolean recoverUnquoted(const StringC &, const Location &,
-+ AttributeContext &, const StringC &);
-+ static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-+};
-+
- class SP_API AttributeDefinitionDesc {
- public:
- AttributeDefinitionDesc() { }
-@@ -378,27 +398,6 @@
- AttributeSemantics *copy() const;
- private:
- ConstPtr<Notation> notation_;
--};
--
--class SP_API AttributeValue : public Resource {
--public:
-- enum Type {
-- implied,
-- cdata,
-- tokenized
-- };
-- AttributeValue();
-- virtual ~AttributeValue();
-- virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
-- AttributeContext &,
-- const StringC &,
-- unsigned &,
-- unsigned &) const;
-- virtual Type info(const Text *&, const StringC *&) const = 0;
-- virtual const Text *text() const;
-- virtual Boolean recoverUnquoted(const StringC &, const Location &,
-- AttributeContext &, const StringC &);
-- static Boolean handleAsUnterminated(const Text &, AttributeContext &);
- };
-
- class SP_API ImpliedAttributeValue : public AttributeValue {
Index: opensp/files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/textproc/opensp/files/patch-Makefile.in,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.1 patch-Makefile.in
--- opensp/files/patch-Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ opensp/files/patch-Makefile.in 7 Jan 2007 14:29:13 -0000
@@ -1,11 +1,23 @@
---- Makefile.in.orig Fri Oct 31 10:13:26 2003
-+++ Makefile.in Fri Oct 31 10:13:32 2003
-@@ -107,7 +107,7 @@
-
+--- Makefile.in.orig Fri Dec 23 23:16:01 2005
++++ Makefile.in Sun Jan 7 23:29:03 2007
+@@ -247,9 +247,9 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
AUTOMAKE_OPTIONS = check-news
-
-SUBDIRS = pubtext unicode doc \
+SUBDIRS = pubtext unicode \
include generic \
+- intl po \
++ po \
lib nsgmls spent spam sgmlnorm sx spcat \
- intl po
+ tests @DOCSRC@
+
+@@ -709,7 +709,7 @@
+
+ info-am:
+
+-install-data-am: install-pkgdocDATA install-pkgincludeHEADERS
++install-data-am: install-pkgincludeHEADERS
+
+ install-exec-am:
+
Index: opensp/files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/textproc/opensp/files/patch-configure,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.1 patch-configure
--- opensp/files/patch-configure 11 Nov 2003 03:00:44 -0000 1.1
+++ opensp/files/patch-configure 24 Aug 2006 18:37:14 -0000
@@ -1,20 +1,17 @@
---- configure.orig Mon Nov 10 13:18:00 2003
-+++ configure Mon Nov 10 13:18:54 2003
-@@ -10832,7 +10832,7 @@
- #include "confdefs.h"
+--- configure.orig Fri Dec 23 23:15:56 2005
++++ configure Fri Aug 25 03:37:02 2006
+@@ -26441,12 +26441,12 @@
+ /* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+extern int *libintl_nl_domain_bindings;
- #ifdef F77_DUMMY_MAIN
- # ifdef __cplusplus
- extern "C"
-@@ -10843,7 +10843,7 @@
+ int
main ()
{
bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
;
return 0;
}
Index: opensp/files/patch-doc-Makefile.in
===================================================================
RCS file: opensp/files/patch-doc-Makefile.in
diff -N opensp/files/patch-doc-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ opensp/files/patch-doc-Makefile.in 24 Aug 2006 18:38:26 -0000
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig Fri Dec 23 23:15:58 2005
++++ doc/Makefile.in Fri Aug 25 03:38:13 2006
+@@ -214,7 +214,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdir = $(datadir)/doc
++docdir = $(prefix)/share/doc
+ pkgdocdir = $(docdir)/@PACKAGE@
+ pkgdochtmldir = $(pkgdocdir)/doc
+ MAINTAINERCLEANFILES = Makefile.in
Index: opensp/files/patch-doc:Makefile.in
===================================================================
RCS file: opensp/files/patch-doc:Makefile.in
diff -N opensp/files/patch-doc:Makefile.in
--- opensp/files/patch-doc:Makefile.in 6 Jan 2003 09:08:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig Mon Nov 25 04:31:16 2002
-+++ doc/Makefile.in Mon Jan 6 17:31:57 2003
-@@ -105,7 +105,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
-
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- pkgdocdir = $(docdir)/@PACKAGE@
-
- MAINTAINERCLEANFILES = Makefile.in
Index: opensp/files/patch-nsgmls::Makefile.in
===================================================================
RCS file: opensp/files/patch-nsgmls::Makefile.in
diff -N opensp/files/patch-nsgmls::Makefile.in
--- opensp/files/patch-nsgmls::Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- nsgmls/Makefile.in.orig Sat Oct 25 21:23:36 2003
-+++ nsgmls/Makefile.in Sat Oct 25 21:23:48 2003
-@@ -142,7 +142,7 @@
- nsgmls_inst.$(OBJEXT)
- onsgmls_OBJECTS = $(am_onsgmls_OBJECTS)
- onsgmls_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--onsgmls_LDFLAGS =
-+onsgmls_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
Index: opensp/files/patch-po-Makefile.in.in
===================================================================
RCS file: opensp/files/patch-po-Makefile.in.in
diff -N opensp/files/patch-po-Makefile.in.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ opensp/files/patch-po-Makefile.in.in 7 Jan 2007 14:01:48 -0000
@@ -0,0 +1,13 @@
+--- po/Makefile.in.in.orig Sun Jan 7 22:59:24 2007
++++ po/Makefile.in.in Sun Jan 7 23:00:49 2007
+@@ -25,8 +25,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
+-gettextsrcdir = $(datadir)/gettext/po
++localedir = $(prefix)/share/locale
++gettextsrcdir = $(prefix)/share/gettext/po
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
Index: opensp/files/patch-sgmlnorm::Makefile
===================================================================
RCS file: opensp/files/patch-sgmlnorm::Makefile
diff -N opensp/files/patch-sgmlnorm::Makefile
--- opensp/files/patch-sgmlnorm::Makefile 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- sgmlnorm/Makefile.in.orig Sat Oct 25 21:24:54 2003
-+++ sgmlnorm/Makefile.in Sat Oct 25 21:25:06 2003
-@@ -136,7 +136,7 @@
- am_osgmlnorm_OBJECTS = sgmlnorm.$(OBJEXT) SGMLGenerator.$(OBJEXT)
- osgmlnorm_OBJECTS = $(am_osgmlnorm_OBJECTS)
- osgmlnorm_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--osgmlnorm_LDFLAGS =
-+osgmlnorm_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
Index: opensp/files/patch-spam::Makefile.in
===================================================================
RCS file: opensp/files/patch-spam::Makefile.in
diff -N opensp/files/patch-spam::Makefile.in
--- opensp/files/patch-spam::Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- spam/Makefile.in.orig Sat Oct 25 21:11:02 2003
-+++ spam/Makefile.in Sat Oct 25 21:11:13 2003
-@@ -138,7 +138,7 @@
- MarkupEventHandler.$(OBJEXT) spam_inst.$(OBJEXT)
- ospam_OBJECTS = $(am_ospam_OBJECTS)
- ospam_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospam_LDFLAGS =
-+ospam_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
Index: opensp/files/patch-spcat::Makefile.in
===================================================================
RCS file: opensp/files/patch-spcat::Makefile.in
diff -N opensp/files/patch-spcat::Makefile.in
--- opensp/files/patch-spcat::Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- spcat/Makefile.in.orig Sat Oct 25 22:06:38 2003
-+++ spcat/Makefile.in Sat Oct 25 22:06:54 2003
-@@ -134,7 +134,7 @@
- am_ospcat_OBJECTS = spcat.$(OBJEXT) spcat_inst.$(OBJEXT)
- ospcat_OBJECTS = $(am_ospcat_OBJECTS)
- ospcat_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospcat_LDFLAGS =
-+ospcat_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
Index: opensp/files/patch-spent::Makefile.in
===================================================================
RCS file: opensp/files/patch-spent::Makefile.in
diff -N opensp/files/patch-spent::Makefile.in
--- opensp/files/patch-spent::Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- spent/Makefile.in.orig Sat Oct 25 21:09:41 2003
-+++ spent/Makefile.in Sat Oct 25 21:09:57 2003
-@@ -134,7 +134,7 @@
- am_ospent_OBJECTS = spent.$(OBJEXT)
- ospent_OBJECTS = $(am_ospent_OBJECTS)
- ospent_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospent_LDFLAGS =
-+ospent_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
Index: opensp/files/patch-sx::Makefile.in
===================================================================
RCS file: opensp/files/patch-sx::Makefile.in
diff -N opensp/files/patch-sx::Makefile.in
--- opensp/files/patch-sx::Makefile.in 31 Oct 2003 04:33:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- sx/Makefile.in.orig Sat Oct 25 21:26:34 2003
-+++ sx/Makefile.in Sat Oct 25 21:27:03 2003
-@@ -140,7 +140,7 @@
- sx_inst.$(OBJEXT)
- osx_OBJECTS = $(am_osx_OBJECTS)
- osx_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--osx_LDFLAGS =
-+osx_LDFLAGS = -lintl
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
----Next_Part(Mon_Jan__8_05_46_47_2007_009)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="openjade.diff"
Index: openjade/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/openjade/Makefile,v
retrieving revision 1.46
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.46 Makefile
--- openjade/Makefile 23 Feb 2006 10:39:28 -0000 1.46
+++ openjade/Makefile 7 Jan 2007 20:05:33 -0000
@@ -6,32 +6,42 @@
#
PORTNAME= openjade
-PORTVERSION= 1.3.2
-PORTREVISION= 7
+PORTVERSION= 1.3.3p1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Object-oriented SGML/XML parser toolkit and DSSSL engine
-LIB_DEPENDS= osp.3:${PORTSDIR}/textproc/opensp
+LIB_DEPENDS= osp.5:${PORTSDIR}/textproc/opensp
RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
USE_PERL5= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \
- --datadir=${PREFIX}/share/sgml/openjade
-INSTALLS_SHLIB= yes
-PLIST_SUB= XMLCATMGR=${XMLCATMGR}
-PLIST_SUB+= CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+ --datadir=${DATADIR}
+INSTALL_TARGET= install install-man
+PLIST_SUB= XMLCATMGR=${XMLCATMGR} \
+ CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
+MAN1= openjade.1
+DATADIR= ${PREFIX}/share/sgml/openjade
+
post-install:
- @${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/openjade
+ @${CAT} ${PLIST} | \
+ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \
+ ${AWK} '/^@comment INSTALL_DATA:/ \
+ {printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi; %s %s/%s %s/%s\n", \
+ $$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \
+ "${WRKSRC}", $$3, "${PREFIX}", $$4}' | \
+ ${SH}
@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG openjade/catalog
.include <bsd.port.pre.mk>
Index: openjade/distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/openjade/distinfo,v
retrieving revision 1.14
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.14 distinfo
--- openjade/distinfo 24 Jan 2006 03:09:46 -0000 1.14
+++ openjade/distinfo 12 Jul 2006 15:01:59 -0000
@@ -1,3 +1,3 @@
-MD5 (openjade-1.3.2.tar.gz) = 7df692e3186109cc00db6825b777201e
-SHA256 (openjade-1.3.2.tar.gz) = 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-SIZE (openjade-1.3.2.tar.gz) = 894834
+MD5 (openjade-1.3.3-pre1.tar.gz) = cbf3d8be3e3516dcb12b751de822b48c
+SHA256 (openjade-1.3.3-pre1.tar.gz) = a15bbed48a4a6bc50d17abdb5e101eb1c60ba1ed52d5a0aff52f2d3aef9568e4
+SIZE (openjade-1.3.3-pre1.tar.gz) = 1058451
Index: openjade/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/openjade/pkg-plist,v
retrieving revision 1.21
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.21 pkg-plist
--- openjade/pkg-plist 23 Feb 2006 10:39:28 -0000 1.21
+++ openjade/pkg-plist 7 Jan 2007 15:17:16 -0000
@@ -12,14 +12,40 @@
lib/libostyle.la
lib/libostyle.so
lib/libostyle.so.0
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove openjade/catalog
-share/sgml/openjade/README.jadetex
-share/sgml/openjade/builtins.dsl
-share/sgml/openjade/catalog
-share/sgml/openjade/demo.dsl
-share/sgml/openjade/demo.sgm
-share/sgml/openjade/dsssl.dtd
-share/sgml/openjade/extensions.dsl
-share/sgml/openjade/fot.dtd
-share/sgml/openjade/style-sheet.dtd
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG openjade/catalog
+@comment INSTALL_DATA: dsssl/README.jadetex %%DATADIR%%/README.jadetex
+@comment INSTALL_DATA: dsssl/builtins.dsl %%DATADIR%%/builtins.dsl
+@comment INSTALL_DATA: dsssl/catalog %%DATADIR%%/catalog
+@comment INSTALL_DATA: dsssl/demo.dsl %%DATADIR%%/demo.dsl
+@comment INSTALL_DATA: dsssl/demo.sgm %%DATADIR%%/demo.sgm
+@comment INSTALL_DATA: dsssl/dsssl.dtd %%DATADIR%%/dsssl.dtd
+@comment INSTALL_DATA: dsssl/extensions.dsl %%DATADIR%%/extensions.dsl
+@comment INSTALL_DATA: dsssl/fot.dtd %%DATADIR%%/fot.dtd
+@comment INSTALL_DATA: dsssl/lineNumber.dsl %%DATADIR%%/lineNumber.dsl
+@comment INSTALL_DATA: dsssl/lineNumber.sgml %%DATADIR%%/lineNumber.sgml
+@comment INSTALL_DATA: dsssl/ps.dsl %%DATADIR%%/ps.dsl
+@comment INSTALL_DATA: dsssl/ps.fot %%DATADIR%%/ps.fot
+@comment INSTALL_DATA: dsssl/ps.sgml %%DATADIR%%/ps.sgml
+@comment INSTALL_DATA: dsssl/psalig.dsl %%DATADIR%%/psalig.dsl
+@comment INSTALL_DATA: dsssl/pscs.dsl %%DATADIR%%/pscs.dsl
+@comment INSTALL_DATA: dsssl/pscspb.dsl %%DATADIR%%/pscspb.dsl
+@comment INSTALL_DATA: dsssl/pscspb.sgml %%DATADIR%%/pscspb.sgml
+@comment INSTALL_DATA: dsssl/psemb.dsl %%DATADIR%%/psemb.dsl
+@comment INSTALL_DATA: dsssl/psempha.dsl %%DATADIR%%/psempha.dsl
+@comment INSTALL_DATA: dsssl/psglyp.dsl %%DATADIR%%/psglyp.dsl
+@comment INSTALL_DATA: dsssl/psglyp2.dsl %%DATADIR%%/psglyp2.dsl
+@comment INSTALL_DATA: dsssl/psinc.dsl %%DATADIR%%/psinc.dsl
+@comment INSTALL_DATA: dsssl/psinc.sgml %%DATADIR%%/psinc.sgml
+@comment INSTALL_DATA: dsssl/psinc2.dsl %%DATADIR%%/psinc2.dsl
+@comment INSTALL_DATA: dsssl/psmulti.dsl %%DATADIR%%/psmulti.dsl
+@comment INSTALL_DATA: dsssl/psmulti2.dsl %%DATADIR%%/psmulti2.dsl
+@comment INSTALL_DATA: dsssl/psmulti3.dsl %%DATADIR%%/psmulti3.dsl
+@comment INSTALL_DATA: dsssl/psradical.dsl %%DATADIR%%/psradical.dsl
+@comment INSTALL_DATA: dsssl/pssbs.dsl %%DATADIR%%/pssbs.dsl
+@comment INSTALL_DATA: dsssl/pssbsi.dsl %%DATADIR%%/pssbsi.dsl
+@comment INSTALL_DATA: dsssl/sps.dsl %%DATADIR%%/sps.dsl
+@comment INSTALL_DATA: dsssl/sps.sgml %%DATADIR%%/sps.sgml
+@comment INSTALL_DATA: dsssl/spsanch.dsl %%DATADIR%%/spsanch.dsl
+@comment INSTALL_DATA: dsssl/spsanch.sgml %%DATADIR%%/spsanch.sgml
+@comment INSTALL_DATA: dsssl/style-sheet.dtd %%DATADIR%%/style-sheet.dtd
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG openjade/catalog
Index: openjade/files/patch-Makefile.comm.in
===================================================================
RCS file: openjade/files/patch-Makefile.comm.in
diff -N openjade/files/patch-Makefile.comm.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openjade/files/patch-Makefile.comm.in 7 Jan 2007 15:29:26 -0000
@@ -0,0 +1,11 @@
+--- Makefile.comm.in.orig Mon Jan 8 00:28:27 2007
++++ Makefile.comm.in Mon Jan 8 00:29:02 2007
+@@ -32,7 +32,7 @@
+ INCS=-I$(srcdir) -I$(srcdir)/../include -I$(spincludedir) -I$(spincludedir)/.. $(INCLUDE)
+ CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS)
+ CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS)
+-LDFLAGS=@LDFLAGS@
++LDFLAGS=@LDFLAGS@ -lintl
+ MSGGENFLAGS= -l jstyleModule
+ CXXDEPGENFLAGS=-MM
+
----Next_Part(Mon_Jan__8_05_46_47_2007_009)----
----Security_Multipart0(Mon_Jan__8_05_46_47_2007_058)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iD8DBQBFoVw3TyzT2CeTzy0RAtNqAJ9Lv+dCl/V/9mUL7p1j34TjM0qVtACgk9fQ
qqQH5vb20yWHasWWzmKRmtQ=
=JWYF
-----END PGP SIGNATURE-----
----Security_Multipart0(Mon_Jan__8_05_46_47_2007_058)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070108.054647.39193809.hrs>