Date: Thu, 6 Dec 2012 02:32:55 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174167: science/flounder: Fix build with clang Message-ID: <20121206023255.694f908e4a096b5c017415b3@yahoo.com> Resent-Message-ID: <201212051810.qB5IA32V033434@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174167 >Category: ports >Synopsis: science/flounder: Fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Dec 05 18:10:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p11 i386 >Organization: >Environment: >Description: - Fix build with clang - Support PLIST_FILES - Strip binaries Remove file: pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/science/flounder/Makefile science/flounder/Makefile --- /usr/ports/science/flounder/Makefile 2012-11-08 06:59:23.000000000 +0900 +++ science/flounder/Makefile 2012-12-03 23:58:13.000000000 +0900 @@ -1,14 +1,9 @@ -# ex:ts=8 -# Ports collection Makefile for: flounder -# Date created: Oct 14, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD: head/science/flounder/Makefile 302037 2012-08-04 22:52:02Z kwm $ -# PORTNAME= flounder PORTVERSION= 0.40 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= science MASTER_SITES= http://www.enel.ucalgary.ca/People/vigmond/flounder/ EXTRACT_SUFX= .tgz @@ -16,35 +11,52 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A quick way to visualize regularly spaced 4D data -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - gif:${PORTSDIR}/graphics/giflib \ - png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib \ + png15:${PORTSDIR}/graphics/png \ + fltk:${PORTSDIR}/x11-toolkits/fltk + +OPTIONS_DEFINE= GNUPLOT GRACE +OPTIONS_DEFAULT=GNUPLOT GRACE +GRACE_DESC= Plotting via GRACE USE_GL= glut -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lstdc++ USE_GMAKE= yes +GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= yes + +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + +PLIST_FILES= bin/flounder bin/igbhead -.if !defined(WITHOUT_PLOT) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGNUPLOT} BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot CONFIGURE_ARGS+= --enable-gnuplot .endif -.if !defined(WITHOUT_GRACE) +.if ${PORT_OPTIONS:MGRACE} BUILD_DEPENDS+= xmgrace:${PORTSDIR}/math/grace RUN_DEPENDS+= xmgrace:${PORTSDIR}/math/grace CONFIGURE_ARGS+= --enable-grace .endif post-patch: - ${REINPLACE_CMD} -e "s|-lungif|-lgif|" ${WRKSRC}/configure - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" -BROKEN= Does not compile on alpha -.endif + @${REINPLACE_CMD} -e \ + 's|-lungif|-lgif|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|cmdline.o.*|cmdline.o| ; \ + /getopt.o/d ; \ + /getopt1.o/d ; \ + s|g++ |$$(CXX) | ; \ + s|-g | |' ${WRKSRC}/utils/Makefile + @${REINPLACE_CMD} -e \ + 's|^main(|int main(|' ${WRKSRC}/utils/igbhead.cc + +do-install: + cd ${WRKSRC}/src && ${INSTALL_PROGRAM} flounder ${PREFIX}/bin + cd ${WRKSRC}/utils && ${INSTALL_PROGRAM} igbhead ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/science/flounder/files/patch-Fl_Gnuplot.cc science/flounder/files/patch-Fl_Gnuplot.cc --- /usr/ports/science/flounder/files/patch-Fl_Gnuplot.cc 2012-11-08 06:59:22.000000000 +0900 +++ science/flounder/files/patch-Fl_Gnuplot.cc 2012-10-23 23:23:04.000000000 +0900 @@ -1,6 +1,11 @@ ---- src/Fl_Gnuplot.cc.orig Tue Oct 15 03:59:41 2002 -+++ src/Fl_Gnuplot.cc Tue Oct 15 04:02:05 2002 -@@ -44,6 +44,7 @@ +--- src/Fl_Gnuplot.cc.orig 2002-12-20 03:56:35.000000000 +0900 ++++ src/Fl_Gnuplot.cc 2012-10-23 23:22:44.000000000 +0900 +@@ -39,11 +39,11 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <fstream.h> + #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -8,7 +13,7 @@ #include "FL/fl_draw.H" #include "FL/fl_ask.H" -@@ -53,12 +54,14 @@ +@@ -53,12 +53,14 @@ #define N_ENTRIES 8192 diff -urN /usr/ports/science/flounder/files/patch-RenderEPS.h science/flounder/files/patch-RenderEPS.h --- /usr/ports/science/flounder/files/patch-RenderEPS.h 2012-11-08 06:59:22.000000000 +0900 +++ science/flounder/files/patch-RenderEPS.h 2012-10-23 23:23:54.000000000 +0900 @@ -1,11 +1,10 @@ ---- src/RenderEPS.h.orig Tue Oct 15 00:35:11 2002 -+++ src/RenderEPS.h Tue Oct 15 00:35:26 2002 -@@ -23,6 +23,8 @@ +--- src/RenderEPS.h.orig 2002-12-19 13:37:24.000000000 +0900 ++++ src/RenderEPS.h 2012-10-23 23:23:41.000000000 +0900 +@@ -20,6 +20,7 @@ + #include <math.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> #include <GL/gl.h> #include <string> - -+using namespace std; -+ - #define FB_BUFSIZE 1000000 - - class RenderEPS { + using namespace std; diff -urN /usr/ports/science/flounder/pkg-plist science/flounder/pkg-plist --- /usr/ports/science/flounder/pkg-plist 2012-11-08 06:59:23.000000000 +0900 +++ science/flounder/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,2 +0,0 @@ -bin/flounder -bin/igbhead >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121206023255.694f908e4a096b5c017415b3>