Attachment 20587 Details for Bug 36293 – file.diff

[patch] file.diff

file.diff (text/plain), 6.90 KB, created by tkato on 2002-03-25 11:00:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-03-25 11:00:09 UTC

Size: 6.90 KB

patch

obsolete

>diff -urN /usr/ports/math/freefem/Makefile math/freefem/Makefile
>--- /usr/ports/math/freefem/Makefile	Wed Nov 29 00:18:15 2000
>+++ math/freefem/Makefile	Fri Mar 22 04:55:05 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	freefem
>-PORTVERSION=	3.5.1
>+PORTVERSION=	3.5.4
> CATEGORIES=	math cad
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	kfem
>@@ -14,21 +14,26 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> USE_X_PREFIX=	yes
>-USE_LIBTOOL=	yes
>-CONFIGURE_ARGS=	--enable-adapt --with-optimization
>+GNU_CONFIGURE=	yes
>+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ARGS=	--with-optimization
>+INSTALLS_SHLIB=	yes
> 
> MAN1=		freefem.1
> 
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/freefem/freefem ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/debian/freefem.1 ${MANPREFIX}/man/man1
>-	@${MKDIR} ${PREFIX}/share/examples/freefem
>-	${INSTALL_DATA} ${WRKSRC}/examples/*.pde ${PREFIX}/share/examples/freefem
>+post-patch:
>+	@${PERL} -pi -e 's|-O3 |\$$CXXFLAGS |g' ${WRKSRC}/configure
>+	@${PERL} -pi -e 's|debian doc freefem|debian freefem|g ; \
>+		 s|^install-data-am:|install-data-am: #|g' ${WRKSRC}/Makefile.in
>+
>+post-install:
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${PREFIX}/share/doc/freefem
>-.for file in ChangeLog NEWS README
>-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/freefem
>+	@${MKDIR} ${DOCSDIR}
>+.for file in ChangeLog NEWS README TODO
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
> .endfor
>+	@${MKDIR} ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/examples/*.pde ${EXAMPLESDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/freefem/distinfo math/freefem/distinfo
>--- /usr/ports/math/freefem/distinfo	Wed Nov 29 00:18:15 2000
>+++ math/freefem/distinfo	Thu Mar 21 13:07:53 2002
>@@ -1 +1 @@
>-MD5 (freefem-3.5.1.tar.gz) = 822fd42fb4b4e9c3152d15b7e0899c98
>+MD5 (freefem-3.5.4.tar.gz) = 746fe6487085011493a805e23507ae30
>diff -urN /usr/ports/math/freefem/files/patch-admin:ltmain.sh math/freefem/files/patch-admin:ltmain.sh
>--- /usr/ports/math/freefem/files/patch-admin:ltmain.sh	Thu Jan  1 09:00:00 1970
>+++ math/freefem/files/patch-admin:ltmain.sh	Thu Mar 21 13:38:33 2002
>@@ -0,0 +1,41 @@
>+--- admin/ltmain.sh.orig	Mon Oct  8 11:27:21 2001
>++++ admin/ltmain.sh	Thu Mar 21 13:38:17 2002
>+@@ -1043,14 +1043,14 @@
>+ 	    # These systems don't actually have a C library (as such)
>+ 	    test "X$arg" = "X-lc" && continue
>+ 	    ;;
>+-	  *-*-openbsd*)
>++	  *-*-openbsd* | *-*-freebsd*)
>+ 	    # Do not include libc due to us having libc/libc_r.
>+ 	    test "X$arg" = "X-lc" && continue
>+ 	    ;;
>+ 	  esac
>+ 	 elif test "X$arg" = "X-lc_r"; then
>+ 	  case $host in
>+-	  *-*-openbsd*)
>++	  *-*-openbsd* | *-*-freebsd*)
>+ 	    # Do not include libc_r directly, use -pthread flag.
>+ 	    continue
>+ 	    ;;
>+@@ -2441,7 +2441,7 @@
>+ 	  *-*-netbsd*)
>+ 	    # Don't link with libc until the a.out ld.so is fixed.
>+ 	    ;;
>+-	  *-*-openbsd*)
>++	  *-*-openbsd* | *-*-freebsd*)
>+ 	    # Do not include libc due to us having libc/libc_r.
>+ 	    ;;
>+ 	  *)
>+@@ -4210,10 +4210,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/math/freefem/files/patch-ah math/freefem/files/patch-ah
>--- /usr/ports/math/freefem/files/patch-ah	Wed Nov 29 00:18:37 2000
>+++ math/freefem/files/patch-ah	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- configure.orig	Mon Nov 27 23:54:52 2000
>-+++ configure	Mon Nov 27 23:57:18 2000
>-@@ -4014,7 +4014,7 @@
>-   withval="$with_optimization"
>-   
>-     if test "$CXX" = "g++" || test "$CXX" = "c++" || test "$host_os" = "linux" ; then
>--	CXXFLAGS="-O3 -fforce-mem -fforce-addr -fomit-frame-pointer"
>-+	CXXFLAGS="$CXXFLAGS -fforce-mem -fforce-addr -fomit-frame-pointer"
>-     fi
>-     if test "$CXX" = "CC" && test "$host_os" = "hpux" ; then
>- 	CXXFLAGS="+O3 +a1"
>diff -urN /usr/ports/math/freefem/pkg-plist math/freefem/pkg-plist
>--- /usr/ports/math/freefem/pkg-plist	Fri Dec 28 16:34:43 2001
>+++ math/freefem/pkg-plist	Fri Mar 22 04:09:24 2002
>@@ -1,31 +1,50 @@
> bin/freefem
>+include/femCommon.hpp
>+include/femDisk.hpp
>+include/femFunction.hpp
>+include/femGibbs.hpp
>+include/femGraphic.hpp
>+include/femGraphicDeviceIndependent.hpp
>+include/femIdentifier.hpp
>+include/femLexical.hpp
>+include/femMesh.hpp
>+include/femMisc.hpp
>+include/femParser.hpp
>+include/femSolver.hpp
>+include/femSolver1.hpp
>+include/femSolver1c.hpp
>+include/femTreeNode.hpp
>+lib/libfreefem.a
>+lib/libfreefem.so
>+lib/libfreefem.so.0
> %%PORTDOCS%%share/doc/freefem/ChangeLog
> %%PORTDOCS%%share/doc/freefem/NEWS
> %%PORTDOCS%%share/doc/freefem/README
>-share/examples/freefem/accous.pde
>-share/examples/freefem/adj.pde
>-share/examples/freefem/brachet.pde
>-share/examples/freefem/condens.pde
>-share/examples/freefem/convectn.pde
>-share/examples/freefem/convhill.pde
>-share/examples/freefem/crack.pde
>-share/examples/freefem/heat.pde
>-share/examples/freefem/holbeam.pde
>-share/examples/freefem/integ.pde
>-share/examples/freefem/lame.pde
>-share/examples/freefem/lamevar.pde
>-share/examples/freefem/multib.pde
>-share/examples/freefem/muonde.pde
>-share/examples/freefem/nacabig.pde
>-share/examples/freefem/nsstep.pde
>-share/examples/freefem/nsstepad.pde
>-share/examples/freefem/shock.pde
>-share/examples/freefem/stokespo.pde
>-share/examples/freefem/timedfm.pde
>-share/examples/freefem/valicplx.pde
>-share/examples/freefem/validate.pde
>-share/examples/freefem/validcplx.pde
>-share/examples/freefem/validsys.pde
>-share/examples/freefem/varvect.pde
>-@dirrm share/examples/freefem
>+%%PORTDOCS%%share/doc/freefem/TODO
>+%%PORTDOCS%%share/examples/freefem/convhill.pde
>+%%PORTDOCS%%share/examples/freefem/multib.pde
>+%%PORTDOCS%%share/examples/freefem/valicplx.pde
>+%%PORTDOCS%%share/examples/freefem/accous.pde
>+%%PORTDOCS%%share/examples/freefem/crack.pde
>+%%PORTDOCS%%share/examples/freefem/muonde.pde
>+%%PORTDOCS%%share/examples/freefem/validate.pde
>+%%PORTDOCS%%share/examples/freefem/adj.pde
>+%%PORTDOCS%%share/examples/freefem/nacabig.pde
>+%%PORTDOCS%%share/examples/freefem/validcplx.pde
>+%%PORTDOCS%%share/examples/freefem/brachet.pde
>+%%PORTDOCS%%share/examples/freefem/heat.pde
>+%%PORTDOCS%%share/examples/freefem/nsstep.pde
>+%%PORTDOCS%%share/examples/freefem/nsstepad.pde
>+%%PORTDOCS%%share/examples/freefem/validsys.pde
>+%%PORTDOCS%%share/examples/freefem/condens.pde
>+%%PORTDOCS%%share/examples/freefem/holbeam.pde
>+%%PORTDOCS%%share/examples/freefem/varvect.pde
>+%%PORTDOCS%%share/examples/freefem/integ.pde
>+%%PORTDOCS%%share/examples/freefem/shock.pde
>+%%PORTDOCS%%share/examples/freefem/lame.pde
>+%%PORTDOCS%%share/examples/freefem/stokespo.pde
>+%%PORTDOCS%%share/examples/freefem/convectn.pde
>+%%PORTDOCS%%share/examples/freefem/lamevar.pde
>+%%PORTDOCS%%share/examples/freefem/timedfm.pde
>+%%PORTDOCS%%@dirrm share/examples/freefem
> %%PORTDOCS%%@dirrm share/doc/freefem

Actions: View | Diff

Attachments on bug 36293: 20587