Date: Sun, 23 Nov 2003 22:45:19 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59613: Update port: science/vis5d+ Message-ID: <20031123224519.7e5a1eaa.tkato@prontomail.com> Resent-Message-ID: <200311231350.hANDoFOE004801@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59613 >Category: ports >Synopsis: Update port: science/vis5d+ >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: Sun Nov 23 05:50:15 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: >Description: - Fix build on -current New file: files/patch-ltmain.sh files/patch-util::main.c Remove file: files/patch-configure >How-To-Repeat: >Fix: diff -urN /usr/ports/science/vis5d+/Makefile science/vis5d+/Makefile --- /usr/ports/science/vis5d+/Makefile Thu Jun 5 09:54:36 2003 +++ science/vis5d+/Makefile Sun Nov 23 13:09:19 2003 @@ -23,22 +23,17 @@ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -USE_MESA= yes -USE_GNOME= gtk12 -USE_LIBTOOL= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +USE_GL= yes +USE_GNOME= gnometarget gtk12 +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --enable-gtk --enable-threads --with-mesa --with-netcdf \ +CONFIGURE_ARGS= --enable-gtk --enable-threads --with-netcdf \ --with-mixkit=${LOCALBASE}/lib/libmix.a --with-x INSTALLS_SHLIB= yes CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_FLAGS} LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> +CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/science/vis5d+/files/patch-configure science/vis5d+/files/patch-configure --- /usr/ports/science/vis5d+/files/patch-configure Fri Sep 20 15:19:33 2002 +++ science/vis5d+/files/patch-configure Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- configure.orig Wed Nov 7 20:54:00 2001 -+++ configure Sun Sep 15 08:57:22 2002 -@@ -6903,6 +6903,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff -urN /usr/ports/science/vis5d+/files/patch-ltmain.sh science/vis5d+/files/patch-ltmain.sh --- /usr/ports/science/vis5d+/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970 +++ science/vis5d+/files/patch-ltmain.sh Sun Nov 23 12:51:54 2003 @@ -0,0 +1,25 @@ +--- ltmain.sh.orig Wed Nov 7 20:53:47 2001 ++++ ltmain.sh Sun Nov 23 11:20:58 2003 +@@ -2408,6 +2408,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4175,10 +4178,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -urN /usr/ports/science/vis5d+/files/patch-util::main.c science/vis5d+/files/patch-util::main.c --- /usr/ports/science/vis5d+/files/patch-util::main.c Thu Jan 1 09:00:00 1970 +++ science/vis5d+/files/patch-util::main.c Sun Nov 23 12:16:07 2003 @@ -0,0 +1,22 @@ +--- util/main.c.orig Wed Oct 24 19:46:49 2001 ++++ util/main.c Sun Nov 23 12:15:53 2003 +@@ -34,9 +34,6 @@ + #include <stdlib.h> + #include <string.h> + #include <fcntl.h> +-#ifdef HAVE_SYS_LOCK_H +-# include <sys/lock.h> +-#endif + #include <errno.h> + #include <signal.h> + #include <unistd.h> +@@ -44,6 +41,9 @@ + #include <sys/time.h> + #include <sys/resource.h> + #include <sys/stat.h> ++#ifdef HAVE_SYS_LOCK_H ++# include <sys/lock.h> ++#endif + + char cc[1000]; + int Argc; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031123224519.7e5a1eaa.tkato>