summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2003-05-18 12:10:53 +0000
committerKris Kennaway <kris@FreeBSD.org>2003-05-18 12:10:53 +0000
commitb61c7a0f393e3f8fd9db6bc9e21b00f2c1bf74ca (patch)
tree3f2546646de4007b66e12b104976897b55d1cd76
parentBROKEN on 5.1: does not build (diff)
WITH_QT_GRAPHICS is BROKEN on 5.1: bad C++ code
Notes
Notes: svn path=/head/; revision=81228
-rw-r--r--games/nethack34/Makefile7
-rw-r--r--textproc/xxdiff/Makefile17
2 files changed, 17 insertions, 7 deletions
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 2667e7448db0..b1e4bc6f70bb 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -33,6 +33,8 @@ HACKNAME?= nethack
HACKDIR?= lib/${HACKNAME}
HACKDOCSDIR?= share/doc/${HACKNAME}
+.include <bsd.port.pre.mk>
+
.if defined(WITH_GNOME_GRAPHICS)
CATEGORIES= games gnome
PKGNAMESUFFIX= -gnome
@@ -41,6 +43,9 @@ USE_GNOME= gnomelibs
MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GRAPHICS= GNOME_GRAPHICS
.elif defined(WITH_QT_GRAPHICS)
+.if ${OSVERSION} >= 500113
+BROKEN= "Does not compile (bad C++ code)"
+.endif
PKGNAMESUFFIX= -qt
USE_QT_VER= 3
MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
@@ -95,4 +100,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index fbf056387958..7a621fe5ed16 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -6,14 +6,13 @@
#
PORTNAME= xxdiff
-PORTVERSION= 2.0.3
+PORTVERSION= 2.9.1
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/petef/g} \
- ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
.if !defined(NOPORTDOCS)
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xxdiff-${PORTVERSION}.html
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} #xxdiff-${PORTVERSION}.html
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
.endif
@@ -22,9 +21,15 @@ COMMENT= QT interface to view/merge differences between 2 or 3 files
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN= "Does not compile (bad C++ code)"
+.endif
+
USE_BISON= yes
USE_GMAKE= yes
-USE_QT_VER= 2
+USE_QT_VER= 3
TMAKEENV= TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++ QTDIR=${X11BASE}
MAKE_ENV+= QTDIR=${X11BASE} PTHREAD_LIBS=${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/xxdiff-${PORTVERSION}/src
@@ -42,4 +47,4 @@ do-install:
${DOCSDIR}/xxdiff.html
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>