ports/140373: [MAINTAINER PATCH] sysutils/moreutils: remove dependency on docbook2X

[Charlie Kester]

>Number:         140373
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] sysutils/moreutils: remove dependency on docbook2X
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:      
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 07 23:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Charlie Kester <corky1951@...>
>Release:        FreeBSD 7.2-RELEASE-p4 i386
>Organization:
>Environment:

System: FreeBSD bigbox.local 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #3: Fri Nov 6 11:51:52 PST 2009 root@...:/usr/obj/usr/src/sys/BIGBOX i386


>Description:
        As a followup to PR# 140105, this patch removes the dependency
        on docbook2man from the docbook2X port, and instead calls
        xsltproc directly in order to build the manpages.   Thanks
        to gabor@... for suggesting this change.

        Also taking the opportunity to remove the superfluous dependency
        on gmake, and to modify the source Makefile to respect CFLAGS.

>How-To-Repeat:
>Fix:


--- moreutils-0.37_2.diff begins here ---
diff -ruN /usr/ports/sysutils/moreutils/Makefile ./moreutils/Makefile
--- /usr/ports/sysutils/moreutils/Makefile 2009-09-20 11:54:27.000000000 -0700
+++ ./moreutils/Makefile 2009-11-07 13:16:05.000000000 -0800
@@ -8,7 +8,7 @@
 
 PORTNAME= moreutils
 PORTVERSION= 0.37
-PORTREVISION= 1
+PORTREVISION= 2
 CATEGORIES= sysutils
 MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
 DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -17,12 +17,12 @@
 COMMENT= Additional Unix utilities
 
 .if !defined(NO_INSTALL_MANPAGES)
-BUILD_DEPENDS= docbook2man:${PORTSDIR}/textproc/docbook2X \
+BUILD_DEPENDS= libxslt>=0:${PORTSDIR}/textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
  ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-440
 .endif
 
 USE_PERL5= yes
-USE_GMAKE= yes
 
 PLIST_FILES= bin/combine \
  bin/ifne \
@@ -57,7 +57,7 @@
  vipe.1 \
  zrun.1
 
-ALL_TARGET+= mans
+ALL_TARGET+= mans extraman
 MANCOMPRESSED= no
 
 # portlint will warn about the next line, but we need it this way
@@ -65,7 +65,7 @@
 NEW_DTD= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd
 
 post-patch:
- @${FIND} ${WRKSRC} -type f -name "*.docbook" | ${XARGS} -n 7 -x ${REINPLACE_CMD} -E -e 's|${OLD_DTD}|${NEW_DTD}|g'
+ ${REINPLACE_CMD} -E -e 's|${OLD_DTD}|${NEW_DTD}|g' ${WRKSRC}/*.docbook
 
 post-install:
 .for manpage in ${MAN1}
diff -ruN /usr/ports/sysutils/moreutils/files/patch-Makefile ./moreutils/files/patch-Makefile
--- /usr/ports/sysutils/moreutils/files/patch-Makefile 2009-09-20 11:54:27.000000000 -0700
+++ ./moreutils/files/patch-Makefile 2009-11-07 13:16:18.000000000 -0800
@@ -1,23 +1,26 @@
---- Makefile.orig 2009-05-05 12:09:22.000000000 -0700
-+++ Makefile 2009-06-20 07:59:27.000000000 -0700
-@@ -1,25 +1,25 @@
+--- Makefile.orig 2009-07-02 12:00:44.000000000 -0700
++++ Makefile 2009-11-07 12:51:25.000000000 -0800
+@@ -1,51 +1,34 @@
 -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
 +BINS=isutf8 ifne pee sponge mispipe lckdo parallel
  PERLSCRIPTS=vidir vipe ts combine zrun
 -MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
-+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
- CFLAGS=-O2 -g -Wall
+-CFLAGS=-O2 -g -Wall
++MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1
++CFLAGS+= -Wall
  INSTALL_BIN?=install -s
 -PREFIX=/usr
 
 -DOCBOOK2XMAN=docbook2x-man
-+DOCBOOK2XMAN=docbook2man
++.SUFFIXES: .1 .docbook
++
++DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
 
  all: $(BINS) $(MANS)
 
-+bins: $(BINS)
++bins: ${BINS}
 +
-+mans: $(MANS)
++mans: ${MANS}
 +
  clean:
  rm -f $(BINS) $(MANS)
@@ -35,3 +38,36 @@
 -
  check: isutf8
  ./check-isutf8
+
+-isutf8.1: isutf8.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-ifdata.1: ifdata.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-ifne.1: ifne.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-pee.1: pee.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-sponge.1: sponge.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-mispipe.1: mispipe.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-lckdo.1: lckdo.docbook
+- $(DOCBOOK2XMAN) $<
+-
+-parallel.1: parallel.docbook
+- $(DOCBOOK2XMAN) $<
++.docbook.1:
++ $(DOCBOOK2XMAN) ${.IMPSRC}
+
+-%.1: %
+- pod2man --center=" " --release="moreutils" $< > $@;
++extraman: ${PERLSCRIPTS}
++.for i in ${PERLSCRIPTS}
++ pod2man --center=" " --release="moreutils" ${i} > ${i:S@$@.1$@};
++.endfor
--- moreutils-0.37_2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
freebsd-ports-bugs@... mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@..."

[sylvio]

Synopsis: [MAINTAINER PATCH] sysutils/moreutils: remove dependency on docbook2X

Responsible-Changed-From-To: freebsd-ports-bugs->sylvio
Responsible-Changed-By: sylvio
Responsible-Changed-When: Tue Nov 10 22:58:17 UTC 2009
Responsible-Changed-Why:
I'll take it.

http://www.freebsd.org/cgi/query-pr.cgi?pr=140373
_______________________________________________
freebsd-ports-bugs@... mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@..."