Before committing the previous BROKEN changes I carefully checked the status

of each port on bento and for recent fixes.  Unfortunately at some point I
got confused and switched to the wrong list :-)  As a result I picked up a
number of ports that were fixed a while ago.  Sorry for the false alarm,
maintainers.

Pointy hat to:	kris

25 files changed, 23 insertions, 169 deletions

diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index ee0e72aa1fa7..d1fb30e5c528 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -20,13 +20,7 @@ LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-configure:
 	@cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py --prefix="${LOCALBASE}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 36e372b57745..6cdeb048382c 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -29,12 +29,6 @@ MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
 	${WRKSRC}/lib/Felt/parser.c \
@@ -53,4 +47,4 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/FElt
 	${CP} ${WRKSRC}/*.html ${PREFIX}/share/doc/FElt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/xsim/Makefile b/chinese/xsim/Makefile
index be1c4fa97290..65f0065a589d 100644
--- a/chinese/xsim/Makefile
+++ b/chinese/xsim/Makefile
@@ -23,12 +23,6 @@ USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cn-locale=EUC
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/xsim/IMdkit/IMConn.c
@@ -41,4 +35,4 @@ post-install:
 	@${CP} -R ${WRKDIR}/usr/local/xsim/dat/* ${DATADIR}/dat
 	@${SED} -e 's,%%X11BASE%%,${X11BASE},g' < ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index bce7d6040593..a3dc93650584 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -27,10 +27,4 @@ ONLY_FOR_ARCHS=	i386
 
 MAN1=		zhcon.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index 9c443f08b6d7..f7d8df0da3ac 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -22,10 +22,4 @@ MANCOMPRESSED=	maybe
 
 WRKSRC=		${WRKDIR}/XCept-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 8fef8c9831b2..f7aa5d72cafe 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -26,12 +26,6 @@ CONFIGURE_ARGS=	--enable-mt
 MAN1=		kaptain.1
 INFO=		kaptain
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/*.info*
 
@@ -39,4 +33,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/examples/dia2code.kaptn
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/m6811-gcc/Makefile b/devel/m6811-gcc/Makefile
index 75825939e891..958771d83691 100644
--- a/devel/m6811-gcc/Makefile
+++ b/devel/m6811-gcc/Makefile
@@ -41,15 +41,9 @@ CONFIGURE_ARGS=		--prefix=${PREFIX} --target=m6811-elf   \
 
 MAN1=		m6811-elf-g++.1 m6811-elf-g77.1 m6811-elf-gcc.1 cccp.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.sed
 	${SED} -e "s/TARGET_CONFIGDIRS = libiberty/TARGET_CONFIGDIRS =/" \
 		${WRKSRC}/Makefile.in.sed > ${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-psyco/Makefile b/devel/py-psyco/Makefile
index 8a131b6a7e07..77287cd8129e 100644
--- a/devel/py-psyco/Makefile
+++ b/devel/py-psyco/Makefile
@@ -21,10 +21,4 @@ USE_PYDISTUTILS=yes
 
 WRKSRC=		${WRKDIR}/psyco-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 8a0b616fefa8..5dd7c2f5c875 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -23,10 +23,6 @@ COMMENT?=	Adaptation of SGI's Standard Template Library
 BROKEN=		"Requires /usr/include/wchar.h for compilation"
 .endif
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 WRKSRC=		${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}/src
 PATCH_WRKSRC=	${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}
 USE_GMAKE=	yes
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index 010438760ab5..991ff7f9f6f1 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -18,14 +18,8 @@ USE_XLIB=	yes
 
 MAN6=	blockade.6
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/blockade ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/blockade.6 ${PREFIX}/man/man6
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index c8010d48018a..66416d635e60 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -32,13 +32,7 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 
 MAN6=		enigma.6
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-install:
 	@${CAT} pkg-message
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index 5270cbb0ee97..cac3543876d6 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -25,12 +25,6 @@ MAN6=		xgammon.6
 
 PATCH_FILES=	${PORTNAME}-${PORTVERSION}-dirent.patch
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
@@ -43,4 +37,4 @@ pre-patch:
 	@${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/${file}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index f5292b7049ff..df8e571388b1 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -33,8 +33,4 @@ post-patch:
 CFLAGS+=	-DINTERP_MMX
 .endif
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index e86d749d77b1..141d123032d9 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -34,12 +34,6 @@ LIB_DATA=	alpi bfct bgk const cyclic defs.h dfff dmul fctrdata fctrtest \
 		fff gr ifplot katsura launch mat nf num primdec \
 		ratint robot solve sp sturm xm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 pre-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DOCSDIR}
@@ -58,4 +52,4 @@ post-install:
 	@${TAR} xfz ${DISTDIR}/${ASIR_DOC} -C ${DOCSDIR}
 	@${INSTALL_MAN} ${DOCSDIR}/${MAN1} ${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index 09767899c60a..921c2149067a 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -18,16 +18,10 @@ COMMENT=	A Unix menuing shell
 NO_WRKSUBDIR=	yes
 MAN1=		mshell.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	zcat ${DISTDIR}/${DISTFILES} |(cd ${WRKDIR}; \
 	${AWK} '{if (/^#!/) x++} {if(x) print $$0'}| ${SH})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/orville-write/Makefile b/misc/orville-write/Makefile
index f5ec90b1b906..2a5b744d4780 100644
--- a/misc/orville-write/Makefile
+++ b/misc/orville-write/Makefile
@@ -17,10 +17,4 @@ MAN1=	amin.1 helpers.1 huh.1 mesg.1 write.1
 
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 49eb71dc993d..7c9b9b7f7045 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -32,12 +32,6 @@ CONFIGURE_ARGS+=--enable-shared --with-artspp=${PREFIX}
 MANL=		cfdases.l cfdifmatrix.l cfdnets.l cfdnexthops.l \
 		cfdportmatrix.l cfdprotos.l cfdtos.l flowdump.l flowwatch.l
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 .if !defined(CFLOWD_FLOWSCAN_PATCH)
 pre-everything::
 	@${ECHO} "you can compile cflowd with patches for FlowScan by typing:"
@@ -48,4 +42,4 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
 		${PREFIX}/etc/rc.d/cflowd-base.sh.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/cflowd/Makefile b/net/cflowd/Makefile
index 49eb71dc993d..7c9b9b7f7045 100644
--- a/net/cflowd/Makefile
+++ b/net/cflowd/Makefile
@@ -32,12 +32,6 @@ CONFIGURE_ARGS+=--enable-shared --with-artspp=${PREFIX}
 MANL=		cfdases.l cfdifmatrix.l cfdnets.l cfdnexthops.l \
 		cfdportmatrix.l cfdprotos.l cfdtos.l flowdump.l flowwatch.l
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 .if !defined(CFLOWD_FLOWSCAN_PATCH)
 pre-everything::
 	@${ECHO} "you can compile cflowd with patches for FlowScan by typing:"
@@ -48,4 +42,4 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
 		${PREFIX}/etc/rc.d/cflowd-base.sh.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile
index cb466b657c6e..0826c3881d52 100644
--- a/palm/ppmtoTbmp/Makefile
+++ b/palm/ppmtoTbmp/Makefile
@@ -17,12 +17,6 @@ LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
 USE_REINPLACE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CFLAGS =.*|CFLAGS += -I${LOCALBASE}/include|g; \
 		s|^LDLIBS =|LDLIBS = -L${LOCALBASE}/lib|g" ${WRKSRC}/Makefile
@@ -38,4 +32,4 @@ do-install:
 	${MKDIR} ${PREFIX}/share/ppmtoTbmp
 	${INSTALL_DATA} ${WRKSRC}/q?.map ${PREFIX}/share/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 36e372b57745..6cdeb048382c 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -29,12 +29,6 @@ MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
 	${WRKSRC}/lib/Felt/parser.c \
@@ -53,4 +47,4 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/FElt
 	${CP} ${WRKSRC}/*.html ${PREFIX}/share/doc/FElt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/calife-devel/Makefile b/security/calife-devel/Makefile
index 6c9499e7db22..1952a7ab72e4 100644
--- a/security/calife-devel/Makefile
+++ b/security/calife-devel/Makefile
@@ -19,10 +19,4 @@ CONFIGURE_ARGS=	"--with-etcdir=$(PREFIX)/etc"
 MAN1=		calife.1
 MAN5=		calife.auth.5
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/calife/Makefile b/security/calife/Makefile
index 6c9499e7db22..1952a7ab72e4 100644
--- a/security/calife/Makefile
+++ b/security/calife/Makefile
@@ -19,10 +19,4 @@ CONFIGURE_ARGS=	"--with-etcdir=$(PREFIX)/etc"
 MAN1=		calife.1
 MAN5=		calife.auth.5
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index e44b06377eaa..649b5b911f4d 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -22,13 +22,7 @@ NOMANCOMPRESS=	yes
 MAN1=		bash.1 bash_builtins.1
 INFO=		bash
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-install:
 	@install-info ${PREFIX}/info/bash.info ${PREFIX}/info/dir
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index 5449c8453ef3..d526f2342c3f 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -25,15 +25,9 @@ MAKEFILE=	GNUmakefile
 MAKE_ARGS=	CXX="${CXX}" \
 		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -DUNIX"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/h2l ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/nmr.tex ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 3fa636aae9e0..e150610db1fe 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -24,12 +24,6 @@ USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xhtml.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
 
@@ -39,4 +33,4 @@ do-build:
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>