diff options
author | marino <marino@FreeBSD.org> | 2015-02-07 03:48:07 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2015-02-07 03:48:07 +0800 |
commit | fa2215afbdf977b893ad39dc6847da6c0c4da52d (patch) | |
tree | 8a6242289c8846bf899be20ab536bf64feefe91d /graphics | |
parent | 09cdc9dd626e3792d7e0b68c018836cc869364fb (diff) | |
download | freebsd-ports-gnome-fa2215afbdf977b893ad39dc6847da6c0c4da52d.tar.gz freebsd-ports-gnome-fa2215afbdf977b893ad39dc6847da6c0c4da52d.tar.zst freebsd-ports-gnome-fa2215afbdf977b893ad39dc6847da6c0c4da52d.zip |
graphics/pixie: Fix build on F9
PR: 194167
Submitted by: Ports Fury
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/pixie/Makefile | 8 | ||||
-rw-r--r-- | graphics/pixie/files/patch-configure | 24 |
2 files changed, 28 insertions, 4 deletions
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 7e2b64416ef4..b73bb8caf00a 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -3,7 +3,7 @@ PORTNAME= pixie PORTVERSION= 2.2.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION} DISTNAME= Pixie-src-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libfltk_gl.so:${PORTSDIR}/x11-toolkits/fltk USE_GL= glu -USES= bison libtool pathfix tar:tgz +USES= bison compiler:c++0x libtool pathfix tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/pixie \ --libdir=${PREFIX}/lib/pixie \ @@ -45,7 +45,7 @@ BROKEN_sparc64= Does not compile on sparc64 OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex @@ -69,4 +69,4 @@ post-install: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ '! -name "*Makefile*"') -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/pixie/files/patch-configure b/graphics/pixie/files/patch-configure new file mode 100644 index 000000000000..5a5410f68a3a --- /dev/null +++ b/graphics/pixie/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig ++++ configure +@@ -12199,7 +12199,7 @@ + old_striplib= + { $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +@@ -18418,10 +18418,10 @@ + if test x$FLTK_CONFIG != xno ; then + if test x$STATIC_FLTK != xtrue ; then + FLTK_CXXFLAGS="`$FLTK_CONFIG --use-gl --cxxflags`" +- FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldstaticflags`" ++ FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldstaticflags | sed 's/ -R.* / /g'`" + else + FLTK_CXXFLAGS="`$FLTK_CONFIG --use-gl --cxxflags`" +- FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldflags`" ++ FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldflags | sed 's/ -R.* / /g'`" + fi + else + FLTK_CXXFLAGS="" |