Index: Makefile =================================================================== RCS file: /usr1/freebsd/cvsroot/ports/textproc/docbook-to-man/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 18 Apr 2008 02:30:15 -0000 1.13 +++ Makefile 10 Sep 2008 10:16:15 -0000 @@ -7,7 +7,7 @@ PORTNAME= docbook-to-man PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.oasis-open.org/docbook/tools/dtm/ DISTNAME= ${PORTNAME} @@ -24,11 +24,6 @@ .endif RUN_DEPENDS+= ${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook -USE_IMAKE= yes -PREFIX?= ${LOCALBASE} -USE_XLIB= yes -XFREE86_HTML_MAN= no - MAN1= oinstant.1 .include @@ -55,7 +50,7 @@ post-extract: move-instant.1 move-instant.1: - @${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.man + @${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.1 # Post patch # @@ -66,4 +61,10 @@ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|;s|%%NSGMLS%%|${NSGMLS}|' \ ${WRKSRC}/cmd/docbook-to-man.sh +# Post install +# + +post-install: + @${INSTALL_MAN} ${WRKSRC}/Instant/oinstant.1 ${MANPREFIX}/man/man1 + .include Index: files/patch-Instant::Imakefile =================================================================== RCS file: files/patch-Instant::Imakefile diff -N files/patch-Instant::Imakefile --- files/patch-Instant::Imakefile 7 Oct 2001 16:33:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ ---- Instant/Imakefile.orig Mon Jun 17 05:50:29 1996 -+++ Instant/Imakefile Fri Oct 5 18:18:22 2001 -@@ -1,14 +1,18 @@ - #define IHaveSubdirs - #define PassCDebugFlags -+#undef BuildInstallHtmlManPage -+#define BuildInstallHtmlManPage(x,y,z) /**/ - - SUBDIRS = tptregexp - --ROOT = /usr/local -+PREFIX ?= /usr/local -+ROOT = ${PREFIX} -+MANPATH = ${ROOT}/man - BINDIR = $(ROOT)/bin - - INCLUDES = -Itptregexp - LOCAL_LIBRARIES = -Ltptregexp -ltptregexp --TPTLIB = $(ROOT)/lib/tpt -+TPTLIB = $(ROOT)/share/sgml/otranspec - DEFINES = -DDEF_TPT_LIB=\"$(TPTLIB)\" - - SRCS = main.c util.c info.c translate.c traninit.c tranvar.c tables.c \ -@@ -19,4 +23,4 @@ - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) - --ComplexProgramTarget(instant) -+ComplexProgramTarget(oinstant) Index: files/patch-Instant_Makefile =================================================================== RCS file: files/patch-Instant_Makefile diff -N files/patch-Instant_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Instant_Makefile 10 Sep 2008 09:57:23 -0000 @@ -0,0 +1,73 @@ +--- Instant/Makefile.orig 1996-06-17 12:50:29.000000000 +0900 ++++ Instant/Makefile 2008-09-10 18:56:40.000000000 +0900 +@@ -60,22 +60,23 @@ + # (You should set DEF_TPT_LIB to something, or set it in general.h. + # At OSF we use the default in that file.) + +-MAKE = make +-SHELL = /bin/sh ++#MAKE = make ++#SHELL = /bin/sh ++RM ?= rm -f + +-ROOT = /usr/local ++ROOT = $(PREFIX) + +-TPTLIB = $(ROOT)/lib/tpt ++TPTLIB = $(ROOT)/share/sgml/otranspec + REGEX_INC = -Itptregexp + REGEX_LIB = tptregexp + BINDIR = $(ROOT)/bin + DEFINES = -DDEF_TPT_LIB=\"$(TPTLIB)\" $(XDEFINES) + +-CC = gcc ++#CC = gcc + +-OPT = -g +-CFLAGS = $(OPT) $(REGEX_INC) $(DEFINES) +-LDFLAGS = $(OPT) ++#OPT = -g ++CFLAGS += $(REGEX_INC) $(DEFINES) ++#LDFLAGS = $(OPT) + REGEX = -L$(REGEX_LIB) -ltptregexp + + CFILES = main.c util.c info.c translate.c traninit.c tranvar.c tables.c \ +@@ -83,18 +84,18 @@ + HFILES = general.h translate.h + OBJ = main.o util.o info.o translate.o traninit.o tranvar.o tables.o \ + browse.o masterVersion.o +-PROGS = instant ++PROGS = oinstant + + all: dotptregexp $(PROGS) + + dotptregexp: + cd tptregexp; $(MAKE) all + +-instant: $(OBJ) ++oinstant: $(OBJ) + $(CC) -o $@ $(LDFLAGS) $(OBJ) $(REGEX) + + install: all +- cp $(PROGS) $(BINDIR) ++ $(INSTALL) $(PROGS) $(BINDIR) + + + Version: allVersion.o +@@ -107,12 +108,12 @@ + + + clean: +- rm -f $(OBJ) allVersion.o lint.out core tags +- cd tptregexp; make clean ++ $(RM) $(OBJ) allVersion.o lint.out core tags ++ cd tptregexp; $(MAKE) clean + + clobber: clean +- rm -f $(PROGS) +- cd tptregexp; make clobber ++ $(RM) $(PROGS) ++ cd tptregexp; $(MAKE) clobber + + tags: $(CFILES) $(HFILES) + ctags $(CFILES) $(HFILES) Index: files/patch-Instant_oinstant.1 =================================================================== RCS file: files/patch-Instant_oinstant.1 diff -N files/patch-Instant_oinstant.1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Instant_oinstant.1 10 Sep 2008 10:02:12 -0000 @@ -0,0 +1,49 @@ +--- Instant/oinstant.1.orig 1996-06-17 12:50:30.000000000 +0900 ++++ Instant/oinstant.1 2008-09-10 19:01:12.000000000 +0900 +@@ -40,22 +40,22 @@ + ...\" written authorization. + ...\" + ...\" Translated with /usr/local/lib/tpt/ref-man.ts by fld on cord, Wed 07 Feb 1996, 21:59 +-.TH "instant" "user cmd" ++.TH "oinstant" "user cmd" + .SH "Name" +-instant - manipulates ESIS from parsed SGML instance ++oinstant - manipulates ESIS from parsed SGML instance + .SH "Synopsis" + .na + .PP +-\fBinstant\fP [ \fB-bhuvxHISW\fP ] [ \fB-t\fP \fIfile\fP] [ \fB-s\fP \fIfile\fP] [ \fB-c\fP \fIfile\fP] [ \fB-o\fP \fIfile\fP] [ \fB-D\fP \fIvariable\fP\fB=\fP\fIvalue\fP ...] [ \fB-i\fP \fIid\fP] [ \fB-l\fP \fIdirectory\fP] [\fIfile\fP] ++\fBoinstant\fP [ \fB-bhuvxHISW\fP ] [ \fB-t\fP \fIfile\fP] [ \fB-s\fP \fIfile\fP] [ \fB-c\fP \fIfile\fP] [ \fB-o\fP \fIfile\fP] [ \fB-D\fP \fIvariable\fP\fB=\fP\fIvalue\fP ...] [ \fB-i\fP \fIid\fP] [ \fB-l\fP \fIdirectory\fP] [\fIfile\fP] + .ad + .SH "Description" + .PP +-The \fBinstant\fP program manipulates an SGML document instance in a variety of ways, ++The \fBoinstant\fP program manipulates an SGML document instance in a variety of ways, + including translating into a form suitable for a formatting application and printing information about this instance. +-Input to \fBinstant\fP is the output of \fBsgmls\fP, whose format is called Element Structure Information Set (ESIS). ++Input to \fBoinstant\fP is the output of \fBsgmls\fP, whose format is called Element Structure Information Set (ESIS). + .SH "Flags" + .PP +-The following are the possible command line options to \fBinstant\fP. Output is sent to the standard output, except where otherwise noted. ++The following are the possible command line options to \fBoinstant\fP. Output is sent to the standard output, except where otherwise noted. + 'br\" labeled list + .IP "\fB-t\fP \fIfile\fP" + Translate the SGML instance to another form, usually suitable for a formatting application. +@@ -97,7 +97,7 @@ + Print the context of each element in the instance, from each element to the root of the document tree. + .IP "\fB-v\fP" + Validate the SGML instance based on the set of constraints or descriptions in the transpec file. +-This flags tells \fBinstant\fP to turn off normal output, leaving only diagnostics. ++This flags tells \fBoinstant\fP to turn off normal output, leaving only diagnostics. + .IP "\fB-l\fP \fIdirectory\fP" + Try to read the translation specs or other files from in the directory \fIdirectory\fP + if not found in the current directory. +@@ -121,7 +121,7 @@ + .IP "\fIfile\fP" + Read the instance from the file \fIfile\fP. + This is expected to be the output of the program \fBsgmls\fP. +-If not specified, \fBinstant\fP reads the instance from its standard input. ++If not specified, \fBoinstant\fP reads the instance from its standard input. + 'br\" labeled list end + .PP + In some cases it makes no sense to combine options. Index: files/patch-Instant_tptregexp_Makefile =================================================================== RCS file: files/patch-Instant_tptregexp_Makefile diff -N files/patch-Instant_tptregexp_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Instant_tptregexp_Makefile 10 Sep 2008 09:35:55 -0000 @@ -0,0 +1,74 @@ +--- Instant/tptregexp/Makefile.orig 2008-09-10 18:05:27.000000000 +0900 ++++ Instant/tptregexp/Makefile 2008-09-10 18:27:02.000000000 +0900 +@@ -21,13 +21,14 @@ + # $Header: /usr/src/docbook-to-man/Instant/tptregexp/RCS/Makefile,v 1.2 1996/06/15 22:55:56 fld Exp $ + # + +-ROOT = /usr/local ++ROOT = $(PREFIX) + +-MAKE = make +-SHELL = /bin/sh ++#MAKE = make ++#SHELL = /bin/sh ++RM ?= rm -f + + LIBDIR = $(ROOT)/lib +-CC = gcc ++#CC = gcc + + # Things you might want to put in ENV and LENV: + # -Dvoid=int compilers that don't do void +@@ -49,9 +50,9 @@ + # -p profiler + PROF= + +-CFLAGS=-O $(ENV) $(TEST) $(PROF) +-LINTFLAGS=$(LENV) $(TEST) -ha +-LDFLAGS= ++CFLAGS+=$(ENV) $(TEST) $(PROF) ++LINTFLAGS+=$(LENV) $(TEST) -ha ++LDFLAGS+= + + OBJ=regexp.o regsub.o regerror.o strerror.o + LSRC=regexp.c regsub.c regerror.c strerror.c +@@ -61,7 +62,7 @@ + all: libtptregexp.a + install: libtptregexp.a + # @echo "No install of regex lib - install in a lib directory by hand if desired." +- cp libtptregexp.a $(LIBDIR) ++ $(INSTALL) libtptregexp.a $(LIBDIR) + + try: try.o $(OBJ) + $(CC) $(LDFLAGS) try.o $(OBJ) -o try +@@ -83,17 +84,17 @@ + + lint: timer.t.h + @echo 'Complaints about multiply-declared regerror() are legit.' +- lint $(LINTFLAGS) $(LSRC) try.c +- lint $(LINTFLAGS) $(LSRC) timer.c ++ $(LINT) $(LINTFLAGS) $(LSRC) try.c ++ $(LINT) $(LINTFLAGS) $(LSRC) timer.c + + regexp.o: regexp.c tptregexp.h regmagic.h + regsub.o: regsub.c tptregexp.h regmagic.h + + clean: +- rm -f *.o core mon.out timer.t.h dMakefile dtr try timer ++ $(RM) *.o core mon.out timer.t.h dMakefile dtr try timer + + clobber: clean +- rm -f libtptregexp.a ++ $(RM) libtptregexp.a + + dtr: r makedtr $(DTR) + makedtr $(DTR) >dtr +@@ -104,6 +105,6 @@ + + lib: libtptregexp.a + libtptregexp.a: $(OBJ) +- ar rcv $@ $(OBJ) +- if [ -f /usr/bin/ranlib ] ; then ranlib $@ ; else true ; fi ++ $(AR) $(ARFLAGS) $@ $(OBJ) ++ $(RANLIB) $@ + Index: files/patch-Makefile =================================================================== RCS file: files/patch-Makefile diff -N files/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile 10 Sep 2008 10:36:33 -0000 @@ -0,0 +1,20 @@ +--- Makefile.orig 1996-06-17 12:50:30.000000000 +0900 ++++ Makefile 2008-09-10 19:36:26.000000000 +0900 +@@ -36,7 +36,7 @@ + # + ############################################################################# + +-ROOT = /usr/local ++ROOT = $(PREFIX) + + SHELL = /bin/sh + MAKE = make +@@ -46,7 +46,7 @@ + + all: + for dir in $(PIECES); \ +- do (cd $$dir; $(MAKE) all); \ ++ do (cd $$dir; $(MAKE) ROOT=$(ROOT) all); \ + done + + install: Index: files/patch-Transpec::Imakefile =================================================================== RCS file: files/patch-Transpec::Imakefile diff -N files/patch-Transpec::Imakefile --- files/patch-Transpec::Imakefile 7 Oct 2001 16:33:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- Transpec/Imakefile.orig Mon Jun 17 05:50:28 1996 -+++ Transpec/Imakefile Fri Oct 5 18:20:17 2001 -@@ -1,5 +1,6 @@ --ROOT = /usr/local --TPTLIB = $(ROOT)/lib/tpt -+PREFIX ?= /usr/local -+ROOT = ${PREFIX} -+TPTLIB = $(ROOT)/share/sgml/otranspec - - all:: - Index: files/patch-Transpec_Makefile =================================================================== RCS file: files/patch-Transpec_Makefile diff -N files/patch-Transpec_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Transpec_Makefile 10 Sep 2008 09:44:01 -0000 @@ -0,0 +1,30 @@ +--- Transpec/Makefile.orig 1996-06-17 12:50:28.000000000 +0900 ++++ Transpec/Makefile 2008-09-10 18:43:02.000000000 +0900 +@@ -36,20 +36,20 @@ + # + ############################################################################# + +-ROOT = /usr/local +-TPTLIB = $(ROOT)/lib/tpt ++ROOT = $(PREFIX) ++TPTLIB = $(ROOT)/share/sgml/otranspec + +-MAKE = make +-SHELL = /bin/sh ++#MAKE = make ++#SHELL = /bin/sh ++MKDIR ?= mkdir -p + + FILES = docbook-to-man.ts roff.cmap roff.sdata + + all: + + install: all +- if [ ! -d $(TPTLIB) ]; then mkdir $(TPTLIB); fi +- cd $(TPTLIB); rm -f $(FILES) +- cp $(FILES) $(TPTLIB) ++ $(MKDIR) $(TPTLIB) ++ $(INSTALL) $(FILES) $(TPTLIB) + + + clean: Index: files/patch-cmd::Imakefile =================================================================== RCS file: files/patch-cmd::Imakefile diff -N files/patch-cmd::Imakefile --- files/patch-cmd::Imakefile 7 Oct 2001 16:33:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ ---- cmd/Imakefile.orig Mon Jun 17 05:50:30 1996 -+++ cmd/Imakefile Fri Oct 5 18:18:22 2001 -@@ -1,4 +1,5 @@ --ROOT = /usr/local -+PREFIX ?= /usr/local -+ROOT = ${PREFIX} - BINDIR = $(ROOT)/bin - - all:: Index: files/patch-cmd::docbook-to-man.sh =================================================================== RCS file: files/patch-cmd::docbook-to-man.sh diff -N files/patch-cmd::docbook-to-man.sh --- files/patch-cmd::docbook-to-man.sh 7 Oct 2001 16:33:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,57 +0,0 @@ ---- cmd/docbook-to-man.sh.orig Mon Jun 17 05:50:30 1996 -+++ cmd/docbook-to-man.sh Fri Oct 5 18:18:22 2001 -@@ -40,9 +40,9 @@ - # ***** change the following paths if your installation of nsgmls and / or - # ***** DocBook isn't into the default places. - --ROOT=/usr/local --SGMLS=$ROOT/lib/sgml --DOCBOOK=$SGMLS/Davenport/dtd -+ROOT=%%PREFIX%% -+SGMLS=$ROOT/share/sgml -+DOCBOOK=$SGMLS/docbook - - - # ***** modify the following line (to "=false") if you're not using the -@@ -51,19 +51,16 @@ - doElanPSInclude=true - - -- - # Everything below this line should be pretty standard and not require - # modification. - - #ulimit -c unlimited - - PARSER=nsgmls --INSTANT=instant -+INSTANT=oinstant - INSTANT_OPT=-d - --CATALOG=$DOCBOOK/docbook.cat --DECL=$DOCBOOK/docbook.dcl --#PROLOG=$DOCBOOK/docbook.prolog -+CATALOG=$DOCBOOK/catalog - - error=false - -@@ -159,17 +156,8 @@ - .ds f4\" - ! - -- --#if [ ! -f $PROLOG ] --#then cat > $PROLOG < --#]> --#! --#fi -- - (cat /tmp/dtm.$$.psinc; -- $PARSER -gl -m$CATALOG $DECL $INSTANCE | -+ $PARSER -gl -c $CATALOG $INSTANCE | - $INSTANT $INSTANT_OPT -croff.cmap -sroff.sdata -tdocbook-to-man.ts) - --rm -f /tmp/dtm.$$.psinc -+rm -f /tmp/dtm.$$.psinc Index: files/patch-cmd_Makefile =================================================================== RCS file: files/patch-cmd_Makefile diff -N files/patch-cmd_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cmd_Makefile 10 Sep 2008 09:46:09 -0000 @@ -0,0 +1,24 @@ +--- cmd/Makefile.orig 1996-06-17 12:50:30.000000000 +0900 ++++ cmd/Makefile 2008-09-10 18:45:34.000000000 +0900 +@@ -36,18 +36,18 @@ + # + ############################################################################# + +-ROOT = /usr/local ++ROOT = $(PREFIX) + BIN = $(ROOT)/bin + + + all: docbook-to-man + + install: all +- cp docbook-to-man $(BIN) ++ $(INSTALL) docbook-to-man $(BIN) + + + clean: + + clobber: clean +- rm -f docbook-to-man ++ $(RM) docbook-to-man + Index: files/patch-cmd_docbook-to-man.sh =================================================================== RCS file: files/patch-cmd_docbook-to-man.sh diff -N files/patch-cmd_docbook-to-man.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cmd_docbook-to-man.sh 7 Oct 2001 16:33:04 -0000 @@ -0,0 +1,57 @@ +--- cmd/docbook-to-man.sh.orig Mon Jun 17 05:50:30 1996 ++++ cmd/docbook-to-man.sh Fri Oct 5 18:18:22 2001 +@@ -40,9 +40,9 @@ + # ***** change the following paths if your installation of nsgmls and / or + # ***** DocBook isn't into the default places. + +-ROOT=/usr/local +-SGMLS=$ROOT/lib/sgml +-DOCBOOK=$SGMLS/Davenport/dtd ++ROOT=%%PREFIX%% ++SGMLS=$ROOT/share/sgml ++DOCBOOK=$SGMLS/docbook + + + # ***** modify the following line (to "=false") if you're not using the +@@ -51,19 +51,16 @@ + doElanPSInclude=true + + +- + # Everything below this line should be pretty standard and not require + # modification. + + #ulimit -c unlimited + + PARSER=nsgmls +-INSTANT=instant ++INSTANT=oinstant + INSTANT_OPT=-d + +-CATALOG=$DOCBOOK/docbook.cat +-DECL=$DOCBOOK/docbook.dcl +-#PROLOG=$DOCBOOK/docbook.prolog ++CATALOG=$DOCBOOK/catalog + + error=false + +@@ -159,17 +156,8 @@ + .ds f4\" + ! + +- +-#if [ ! -f $PROLOG ] +-#then cat > $PROLOG < +-#]> +-#! +-#fi +- + (cat /tmp/dtm.$$.psinc; +- $PARSER -gl -m$CATALOG $DECL $INSTANCE | ++ $PARSER -gl -c $CATALOG $INSTANCE | + $INSTANT $INSTANT_OPT -croff.cmap -sroff.sdata -tdocbook-to-man.ts) + +-rm -f /tmp/dtm.$$.psinc ++rm -f /tmp/dtm.$$.psinc