diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2005-02-07 21:16:05 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2005-02-07 21:16:05 +0000 |
commit | df997bbf4ff846ab91f0b4e26908218c9b605c59 (patch) | |
tree | d43ed2ede40495dcd3e82ee00a9da6d6790aacc8 /x11-toolkits/fltk | |
parent | 3622db4708c4ad4cff2de19ecf6659201a3cda71 (diff) | |
download | ports-df997bbf4ff846ab91f0b4e26908218c9b605c59.tar.gz ports-df997bbf4ff846ab91f0b4e26908218c9b605c59.zip |
Notes
Diffstat (limited to 'x11-toolkits/fltk')
-rw-r--r-- | x11-toolkits/fltk/Makefile | 17 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-fltk-config.in | 11 |
2 files changed, 27 insertions, 1 deletions
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index 5ed1409b4680..9c0dd83fd62c 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -7,9 +7,13 @@ PORTNAME= fltk PORTVERSION= ${VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +.ifdef WITH_THREADS +PKGNAMESUFFIX= -threads +.endif DISTNAME= ${PORTNAME}-${VERSION}-source MAINTAINER?= demon@FreeBSD.org @@ -23,6 +27,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ CONFIGURE_ARGS+=--enable-threads CPPFLAGS+= "${PTHREAD_CFLAGS}" LDFLAGS+= "${PTHREAD_LIBS}" +CONFLICTS= fltk-1* +.else +CONFLICTS= fltk-threads-1* .endif VERSION= 1.1.6 @@ -42,9 +49,17 @@ USE_REINPLACE= yes MAN1= fluid.1 fltk-config.1 MAN3= fltk.3 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 && defined(WITH_THREADS) +IGNORE= "does not work on FreeBSD 4.x, because threading is not activated" +.endif + pre-everything:: +.if !defined(WITH_THREADS) && ${OSVERSION} > 500000 @${ECHO_MSG} "===> You can enable threads support by defining WITH_THREADS" @${ECHO_MSG} "===>" +.endif pre-configure: .if defined(NOPORTDOCS) @@ -53,4 +68,4 @@ pre-configure: @${REINPLACE_CMD} -e 's|%%DOCS%%||' ${WRKSRC}/documentation/Makefile .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/fltk/files/patch-fltk-config.in b/x11-toolkits/fltk/files/patch-fltk-config.in new file mode 100644 index 000000000000..a23254efa6e9 --- /dev/null +++ b/x11-toolkits/fltk/files/patch-fltk-config.in @@ -0,0 +1,11 @@ +--- fltk-config.in.orig Mon Sep 6 13:20:52 2004 ++++ fltk-config.in Thu Feb 3 23:03:41 2005 +@@ -199,7 +199,7 @@ + LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC" + fi + +-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS" ++LDLIBS="$DSOLINK $libs $LDLIBS" + LDSTATIC="$LDFLAGS $libs $LDSTATIC" + + # Answer to user requests |