svn commit: r309945 - in head: . textproc textproc/docproj textproc/docproj-jadetex textproc/docproj-nojadetex

Glen Barber gjb at FreeBSD.org
Sat Jan 5 00:41:33 UTC 2013 

Author: gjb
Date: Sat Jan  5 00:41:31 2013
New Revision: 309945
URL: http://svnweb.freebsd.org/changeset/ports/309945

Log:
  Updates to textproc/docproj* ports:
  
   o textproc/docproj-jadetex:
     - Remove port; functionality is moved to
       textproc/docproj
  
   o textproc/docproj-nojadetex:
     - Remove extraneous MAINTAINER line
     - Trim headers
  
   o textproc/docproj:
     - Trim headers
     - Convert to new options framework
     - Default to WITH_JADETEX=yes
     - Make devel/subversion dependency optional while
       noting it is required for source checkout; this
       allows us to skip svn and dependencies for release
       builds
     - Bump PORTREVISION
  
   o Add UPDATING entry explaining who needs to update
     port origins
  
   o Add MOVED entry for textproc/docproj-jadetex

Deleted:
  head/textproc/docproj-jadetex/
Modified:
  head/MOVED
  head/UPDATING
  head/textproc/Makefile
  head/textproc/docproj-nojadetex/Makefile
  head/textproc/docproj/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Jan  4 22:48:02 2013	(r309944)
+++ head/MOVED	Sat Jan  5 00:41:31 2013	(r309945)
@@ -3996,3 +3996,4 @@ mail/horde4-turba|mail/horde-turba|2012-
 mail/horde4-webmail|mail/horde-webmail|2012-12-18|Move horde4-* apps to horde-*
 textproc/hs-xml2html||2012-12-20|Removed: this package is obsolete
 sysutils/makefs||2012-12-21|Has expired: Part of base in an earlier version for every supported FreeBSD version
+textproc/docproj-jadetex||2013-01-03|Removed: Deprecated in favor of textproc/docproj

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Jan  4 22:48:02 2013	(r309944)
+++ head/UPDATING	Sat Jan  5 00:41:31 2013	(r309945)
@@ -5,6 +5,38 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120103:
+  AFFECTS: users of textproc/docproj*
+  AUTHOR: doceng at FreeBSD.org
+
+  textproc/docproj no longer requires WITH_JADETEX to be set to 'yes' or
+  'no', and by default, will enable the JADETEX dependencies.
+
+  The textproc/docproj-jadetex port has been removed as a result of this
+  change.
+
+  Users that have installed textproc/docproj and have set
+  WITH_JADETEX=no during compile time should update the package origin
+  to use textproc/docproj-nojadetex:
+
+  # portmaster -o textproc/docproj textproc/docproj-nojadetex
+  or
+  # portupgrade -fo textproc/docproj textproc/docproj-nojadetex
+  or
+  # pkg set -o textproc/docproj-nojadetex:textproc/docproj
+
+  Users that have installed textproc/docproj-jadetex should update the
+  package origin to use the textproc/docproj port:
+
+  # portmaster -o textproc/docproj textproc/docproj-jadetex
+  or
+  # portupgrade -fo textproc/docproj textproc/docproj-jadetex
+  or
+  # pkg set -o textproc/docproj-jadetex:textproc/docproj
+
+  Users that have installed textproc/docproj and have set
+  WITH_JADETEX=yes will not need to make any changes.
+
 20130103:
   AFFECTS: users of audio/baresip
   AUTHOR: crees at FreeBSD.org

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Fri Jan  4 22:48:02 2013	(r309944)
+++ head/textproc/Makefile	Sat Jan  5 00:41:31 2013	(r309945)
@@ -135,7 +135,6 @@
     SUBDIR += docdiff
     SUBDIR += doclifter
     SUBDIR += docproj
-    SUBDIR += docproj-jadetex
     SUBDIR += docproj-nojadetex
     SUBDIR += dom4j
     SUBDIR += domc

Modified: head/textproc/docproj-nojadetex/Makefile
==============================================================================
--- head/textproc/docproj-nojadetex/Makefile	Fri Jan  4 22:48:02 2013	(r309944)
+++ head/textproc/docproj-nojadetex/Makefile	Sat Jan  5 00:41:31 2013	(r309945)
@@ -1,14 +1,9 @@
-# New ports collection makefile for:   docproj-nojadetex
-# Date created:        25 July 2002
-# Whom:                Cyrille Lefevre <cyrille.lefevre at laposte.net>
-#
+# Created by: Cyrille Lefevre <cyrille.lefevre at laposte.net>
 # $FreeBSD$
 #
 
 PKGNAMESUFFIX=	-nojadetex
-WITH_JADETEX=	no
-
-MAINTAINER=	cyrille.lefevre at laposte.net
+WITHOUT_JADETEX=yes
 
 MASTERDIR=	${.CURDIR}/../docproj
 

Modified: head/textproc/docproj/Makefile
==============================================================================
--- head/textproc/docproj/Makefile	Fri Jan  4 22:48:02 2013	(r309944)
+++ head/textproc/docproj/Makefile	Sat Jan  5 00:41:31 2013	(r309945)
@@ -1,13 +1,10 @@
-# New ports collection makefile for:   docproj
-# Date created:        27 June 1998
-# Whom:                Nik Clayton <nik at freebsd.org>
-#
+# Created by: Nik Clayton <nik at freebsd.org>
 # $FreeBSD$
 #
 
 PORTNAME=	docproj
 PORTVERSION=	1.17
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -29,7 +26,6 @@ RUN_DEPENDS=	fixrtf:${PORTSDIR}/textproc
 		tidy:${PORTSDIR}/www/tidy-lib \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		peps:${PORTSDIR}/graphics/peps \
-		svn:${PORTSDIR}/devel/subversion \
 		${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
 		${LOCALBASE}/share/sgml/html/catalog:${PORTSDIR}/textproc/html \
 		${LOCALBASE}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
@@ -41,36 +37,41 @@ RUN_DEPENDS=	fixrtf:${PORTSDIR}/textproc
 		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
 		p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser
 
+OPTIONS_DEFINE=		JADETEX OPENJADE CJK SVN
+JADETEX_DESC=		Support building additional document formats (PDF)
+OPENJADE_DESC=		Install textproc/openjade instead of textproc/jade
+CJK_DESC=		CJK (Simplified Chinese Language) support
+SVN_DESC=		Subversion support (required to check out sources)
+OPTIONS_DEFAULT=	OPENJADE CJK SVN
+
+.if !defined(WITHOUT_JADETEX) || defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT+=	JADETEX
+.endif
+
+.include <bsd.port.options.mk>
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_OPENJADE) || ${ARCH} != "i386"
+.if ${PORT_OPTIONS:MOPENJADE} || ${ARCH} != "i386"
 RUN_DEPENDS+=	openjade:${PORTSDIR}/textproc/openjade \
 		onsgmls:${PORTSDIR}/textproc/opensp
 .else
 RUN_DEPENDS+=	jade:${PORTSDIR}/textproc/jade
 .endif
 
-.if defined(JADETEX)
-WITH_JADETEX=	${JADETEX}
+.if ${PORT_OPTIONS:MSVN}
+RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 .endif
-WITH_JADETEX?=
 
-.if defined(PACKAGE_BUILDING)
-WITH_JADETEX=	yes
-.endif
-
-.if empty(WITH_JADETEX)
-IGNORE=		user must set WITH_JADETEX variable to 'yes' or 'no'
-.endif
-.if defined(WITH_JADETEX) && ${WITH_JADETEX} == yes
+.if ${PORT_OPTIONS:MJADETEX}
 RUN_DEPENDS+=	${LOCALBASE}/share/texmf/web2c/jadetex.fmt:${PORTSDIR}/print/jadetex
 RUN_DEPENDS+=	dvips:${PORTSDIR}/print/dvipsk-tetex
-.if !defined(WITHOUT_CJK)
+.if ${PORT_OPTIONS:MCJK}
 RUN_DEPENDS+=	cjktexsty:${PORTSDIR}/chinese/docproj
 .endif
 .endif
 
-.if !defined(WITHOUT_CJK)
+.if ${PORT_OPTIONS:MCJK}
 RUN_DEPENDS+=	html2text:${PORTSDIR}/textproc/html2text
 .endif
 
@@ -88,20 +89,12 @@ DEPENDS_ARGS+=	BATCH=yes
 DEPENDS_ARGS+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
-message-jadetex:
-	@${CAT} ${FILESDIR}/JADETEX
-	@${FALSE}
-
 # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports.
 # (XXX: incomplete yet)
 minimaldocports:
 	@${ECHO_CMD} "MINIMALDOCPORTS= \\"
 	@${MAKE} all-depends-list | ${SED} -e 's,^${PORTSDIR}/,	,' -e 's,$$, \\,'
 
-.if empty(WITH_JADETEX) && !make(deinstall)
-pre-everything:: message-jadetex
-.endif
-
 do-install:	# empty
 
 .include <bsd.port.post.mk>

More information about the svn-ports-all mailing list