[Midnightbsd-cvs] mports: textproc/docproj: s/Free/Midnight The Non X11 version of gs

[laffer1 at midnightbsd.org]

Log Message:
-----------
s/Free/Midnight 

The Non X11 version of gs was always pulled in.  Try to work around that.

Modified Files:
--------------
    mports/textproc/docproj:
        Makefile (r1.6 -> r1.7)
        pkg-descr (r1.1 -> r1.2)
    mports/textproc/docproj/files:
        JADETEX (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/textproc/docproj/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/docproj/pkg-descr -L textproc/docproj/pkg-descr -u -r1.1 -r1.2
--- textproc/docproj/pkg-descr
+++ textproc/docproj/pkg-descr
@@ -1,4 +1,4 @@
-The FreeBSD Documentation Project maintains the FAQ, Handbook and tutorials.
+The Documentation Project maintains the FAQ, Handbook and tutorials.
 
 This package does not contain anything by itself -- it is a
 "meta-port" that depends on other text processing packages.  Its sole 
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/docproj/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L textproc/docproj/Makefile -L textproc/docproj/Makefile -u -r1.6 -r1.7
--- textproc/docproj/Makefile
+++ textproc/docproj/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	docproj
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -21,7 +22,6 @@
 USE_GHOSTSCRIPT_RUN=	yes
 USE_PERL5_RUN=		yes
 
-
 # This dependency list should be kept in sync with the list of
 # required ports in src/release/Makefile.inc.docports.
 
@@ -40,9 +40,8 @@
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
-
-
+		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
 .include <bsd.port.pre.mk>
 
@@ -73,18 +72,15 @@
 RUN_DEPENDS+=	html2text:${PORTSDIR}/textproc/html2text
 .endif
 
-
 PLIST_FILES=		#empty
-
-DEPENDS_ARGS+=	BATCH=yes WITHOUT_X11=${WITHOUT_X11}
+DEPENDS_ARGS+=	BATCH=yes
+.if defined(WITHOUT_X11)
+DEPENDS_ARGS+=	WITHOUT_X11=${WITHOUT_X11}
+.endif
 
 message-jadetex:
 	@${CAT} ${FILESDIR}/JADETEX
 	@${FALSE}
-message-gs:
-	@${ECHO_MSG} "NOTICE: Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO_MSG} "        AFPL Postscript interpreter instead of GNU one."
-	@${ECHO_MSG} ""
 
 # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports.
 # (XXX: incomplete yet)
@@ -95,9 +91,6 @@
 .if empty(WITH_JADETEX) && !make(deinstall)
 pre-everything:: message-jadetex
 .endif
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-pre-everything:: message-gs
-.endif
 
 do-install:	# empty
 
Index: JADETEX
===================================================================
RCS file: /home/cvs/mports/textproc/docproj/files/JADETEX,v
retrieving revision 1.1
retrieving revision 1.2
diff -L textproc/docproj/files/JADETEX -L textproc/docproj/files/JADETEX -u -r1.1 -r1.2
--- textproc/docproj/files/JADETEX
+++ textproc/docproj/files/JADETEX
@@ -1,4 +1,4 @@
-This port will try and ensure that the tools used by the FreeBSD
+This port will try and ensure that the tools used by the MidnightBSD
 Documentation Project are installed on your system so you can convert
 documentation from SGML to other formats.