Index: head/textproc/docbook-to-man/Makefile
===================================================================
--- head/textproc/docbook-to-man/Makefile	(revision 166045)
+++ head/textproc/docbook-to-man/Makefile	(revision 166046)
@@ -1,72 +1,69 @@
 # New ports collection makefile for:	gnupg-devel
 # Date created:		5 Oct 2001
 # Whom:			Cyrille Lefevre <clefevre@citeweb.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	docbook-to-man
 PORTVERSION=	1.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/tools/dtm/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DocBook SGML DTD into nroff/troff -man macros converter
 
 .include <bsd.port.pre.mk>
 
 # Global variables
 #
 
 # There are two ports that satisfy the nsgmls requirement.
-# Jade is preferred, but it currently doesn't compile on 2.1.x
-# system, so use sp in that case.
+# Jade is preferred.
 
 .if ${MACHINE_ARCH} == "alpha"
 WITH_OPENJADE=	yes
 .endif
 
-.if ${OSVERSION} < 220000
-RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/sp
-.elif defined(WITH_OPENJADE)
+.if defined(WITH_OPENJADE)
 RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/openjade
 .else
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
 .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
 
 # Local variables
 #
 
 .if defined(WITH_OPENJADE)
 NSGMLS=		onsgmls
 .else
 NSGMLS=		nsgmls
 .endif
 
 # Post extract
 #
 
 post-extract: move-instant.1
 
 move-instant.1:
 	@${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.man
 
 # Post patch
 #
 
 post-patch: patch-docbook-to-man
 
 patch-docbook-to-man:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|;s|%%NSGMLS%%|${NSGMLS}|' \
 		${WRKSRC}/cmd/docbook-to-man.sh
 
 .include <bsd.port.post.mk>

Property changes on: head/textproc/docbook-to-man/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/textproc/sgmlformat/Makefile
===================================================================
--- head/textproc/sgmlformat/Makefile	(revision 166045)
+++ head/textproc/sgmlformat/Makefile	(revision 166046)
@@ -1,54 +1,51 @@
 # New ports collection makefile for:	sgmlformat
 # Date created:		July 16, 1997
 # Whom:			jfieber
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sgmlformat
 PORTVERSION=	1.7
 PORTREVISION=	2
 CATEGORIES=	textproc print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
 #MASTER_SITES=	http://fallout.campusview.indiana.edu/ports/distfiles/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Generates groff and HTML from linuxdoc and docbook SGML documents
 
 # There are two ports that satisfy the nsgmls requirement.
-# Jade is preferred, but it currently doesn't compile on 2.1.x
-# system, so use sp in that case.
+# Jade is preferred.
 
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} != "i386"
 WITH_OPENJADE=	yes
 .endif
 
-.if ${OSVERSION} < 220000
-RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/sp
-.elif defined(WITH_OPENJADE)
+.if defined(WITH_OPENJADE)
 RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/openjade
 .else
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
 .endif
 RUN_DEPENDS+=	${PREFIX}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
 		${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
 
 USE_PERL5_RUN=	yes
 
 MAN1=		instant.1 sgmlfmt.1
 MAN5=		transpec.5
 MANCOMPRESSED=	yes
 
 .if defined(WITH_OPENJADE)
 post-patch:
 	@${REINPLACE_CMD} -e 's,nsgmls,onsgmls,g' ${WRKSRC}/sgmlfmt/sgmlfmt.pl
 	@${REINPLACE_CMD} -e 's,nsgmls,onsgmls,g' ${WRKSRC}/instant/traninit.c
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/textproc/sgmlformat/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.32
\ No newline at end of property
+1.33
\ No newline at end of property