diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/hdr_tools/Makefile | 5 | ||||
-rw-r--r-- | graphics/libGL/Makefile.common | 5 | ||||
-rw-r--r-- | graphics/libgphoto2/Makefile | 2 | ||||
-rw-r--r-- | graphics/mitsuba/Makefile | 12 | ||||
-rw-r--r-- | graphics/ocrad/Makefile | 9 | ||||
-rw-r--r-- | graphics/pixie/Makefile | 9 | ||||
-rw-r--r-- | graphics/seexpr/Makefile | 13 | ||||
-rw-r--r-- | graphics/xfractint/Makefile | 8 | ||||
-rw-r--r-- | graphics/xfractint/files/pre-1000034-libm-patch | 44 |
9 files changed, 4 insertions, 103 deletions
diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile index 02c2d13866c6..a6889f2ea501 100644 --- a/graphics/hdr_tools/Makefile +++ b/graphics/hdr_tools/Makefile @@ -36,11 +36,6 @@ CXXFLAGS+= -msse2 -mfpmath=sse CXXFLAGS+= -fopenmp .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034 -LIB_DEPENDS+= libml.so:math/ldouble -LDFLAGS+= -lml -.endif - post-patch: @${REINPLACE_CMD} -e 's,RGBColorspace,s&,' ${WRKSRC}/image.cc diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common index e3d6e223bbe0..255b6178d734 100644 --- a/graphics/libGL/Makefile.common +++ b/graphics/libGL/Makefile.common @@ -46,11 +46,6 @@ PKGDEINSTALL= ${.CURDIR}/pkg-deinstall PORTSCOUT= ignore:1 .endif -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_prog_LEX=${LOCALBASE}/bin/flex -.endif - python_OLD_CMD= "/usr/bin/env[[:space:]]python" python_CMD= ${LOCALBASE}/bin/python2 SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index ec20aac91d51..de220c70198d 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -45,8 +45,6 @@ NLS_CONFIGURE_ENABLE= nls XML_USE= GNOME=libxml2 XML_CONFIGURE_OFF= --with-libxml-2.0=no -.include <bsd.port.options.mk> - post-patch: .for i in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ diff --git a/graphics/mitsuba/Makefile b/graphics/mitsuba/Makefile index 113a0bf8e3b2..8a2744168d6f 100644 --- a/graphics/mitsuba/Makefile +++ b/graphics/mitsuba/Makefile @@ -39,16 +39,6 @@ MAKE_JOBS_UNSAFE= yes HG_REVISION= 11ee1d7236f3 FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} -.include <bsd.port.pre.mk> - -# Unfortunately, the code is not GCC 4.2.1 compatible (due to bugs in GCC -# itself). Use system compiler if it is Clang. -.if ${OSVERSION} < 1000024 -CC= clang -CXX= clang++ -CPP= clang-cpp -.endif - post-patch: @${REINPLACE_CMD} -e '/CMAKE_SYSTEM_NAME/s,Linux,${OPSYS},' \ ${WRKSRC}/data/cmake/MitsubaExternal.cmake \ @@ -61,4 +51,4 @@ post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles/ior_database.dir @${RMDIR} ${STAGEDIR}${PREFIX}/share/mitsuba/data/ior/CMakeFiles -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile index 8ed15ef63fb0..1bfa071b5d54 100644 --- a/graphics/ocrad/Makefile +++ b/graphics/ocrad/Makefile @@ -22,15 +22,6 @@ PLIST_FILES= bin/${PORTNAME} man/man1/ocrad.1.gz OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000024 -EXTRACT_DEPENDS= lzip:archivers/lzip -EXTRACT_CMD= ${LOCALBASE}/bin/lzip -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index 806b55f33f63..11854381f2f3 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -46,13 +46,6 @@ BROKEN_sparc64= Does not compile on sparc64 OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -CONFIGURE_ENV+= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" -.endif - post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g ; \ s|-lpthread|-pthread|g' ${WRKSRC}/configure @@ -63,7 +56,7 @@ post-patch: ${WRKSRC}/src/ri/Makefile.in \ ${WRKSRC}/src/sdr/Makefile.in -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog DEVNOTES NEWS \ README ${STAGEDIR}${DOCSDIR}) diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile index 440308d49a36..3fbc85480a98 100644 --- a/graphics/seexpr/Makefile +++ b/graphics/seexpr/Makefile @@ -27,19 +27,8 @@ CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DUSE_SSE41:BOOL=ON .endif -.include <bsd.port.pre.mk> - -# base flex(1) v2.5.4 is not sufficient -.if ${OSVERSION} < 1000033 -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex -.endif - post-patch: @${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr/SePlatform.h @${REINPLACE_CMD} -e 's, "dl",,' ${WRKSRC}/src/SeExpr/CMakeLists.txt -.if ${OSVERSION} < 1000033 - @${REINPLACE_CMD} -e '/COMMAND/s,flex,${LOCALBASE}/bin/&,' \ - ${WRKSRC}/src/build/macros.cmake -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index b06270efd72e..a7e2af0da8ff 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -17,12 +17,6 @@ ALL_TARGET= ${PORTNAME} DESKTOP_ENTRIES= "Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1000034 -EXTRA_PATCHES= ${FILESDIR}/pre-1000034-libm-patch -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man \ @@ -34,4 +28,4 @@ do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/xfractint/files/pre-1000034-libm-patch b/graphics/xfractint/files/pre-1000034-libm-patch deleted file mode 100644 index 5d2ad985bb3c..000000000000 --- a/graphics/xfractint/files/pre-1000034-libm-patch +++ /dev/null @@ -1,44 +0,0 @@ ---- common/mpmath_c.c.orig 2012-03-10 17:28:37.000000000 -0500 -+++ common/mpmath_c.c 2012-03-10 17:34:32.000000000 -0500 -@@ -220,7 +220,7 @@ - if(t.x < -690) - e2x = 0.0; - else -- e2x = expl(t.x); -+ e2x = exp(t.x); - #ifdef XFRACT - if (isnan(e2x) || isinf(e2x)) - e2x = 1.0; ---- common/soi.c.orig 2011-05-07 15:36:36.000000000 -0500 -+++ common/soi.c 2012-03-10 17:08:47.000000000 -0500 -@@ -25,7 +25,7 @@ - #define FABS(x) fabsl(x) - /* the following needs to be changed back to frexpl once the portability - issue has been addressed JCO */ --#ifndef XFRACT -+#ifndef __FreeBSD__ - #define FREXP(x,y) frexpl(x,y) - #else - #define FREXP(x,y) frexp(x,y) ---- unix/fpu087.c.orig 2012-03-10 17:28:49.000000000 -0500 -+++ unix/fpu087.c 2012-03-10 17:36:40.000000000 -0500 -@@ -86,8 +86,8 @@ - *Sinh = 1.0; - *Cosh = 1.0; - } else { -- *Sinh = (LDBL)sinhl(*Angle); -- *Cosh = (LDBL)coshl(*Angle); -+ *Sinh = (LDBL)sinh(*Angle); -+ *Cosh = (LDBL)cosh(*Angle); - } - if (isnan(*Sinh) || isinf(*Sinh)) - *Sinh = 1.0; -@@ -119,7 +119,7 @@ - { - LDBL pwr,y; - y = x->y; -- pwr = expl(x->x); -+ pwr = exp(x->x); - if (isnan(pwr) || isinf(pwr)) - pwr = 1.0; - z->x = (double)(pwr*cosl(y)); |