Upgrade to 2010.06.14, aka 3.0a.

We are now allowed by the author to distribute the sources.

6 files changed, 48 insertions, 98 deletions

diff --git a/science/medit/Makefile b/science/medit/Makefile
index 7945db3a6649..b09b91d75289 100644
--- a/science/medit/Makefile
+++ b/science/medit/Makefile
@@ -5,94 +5,50 @@
 # $FreeBSD$
 
 PORTNAME=	medit
-PORTVERSION=	2006.09.24
-PORTREVISION=	2
+PORTVERSION=	2010.06.14
 CATEGORIES=	science graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}	\
-		http://www.ann.jussieu.fr/~frey/logiciels/:author
-MASTER_SITE_SUBDIR=	thierry
+MASTER_SITES=	http://www.ann.jussieu.fr/~frey/ftp/archives/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	# See hereunder
+DISTFILES=	${SOURCETARB} ${LIBTARBALL}
+EXTRACT_ONLY=	${SOURCETARB}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Interactive meshes visualization
 
-.if defined(MAINTAINER_MODE)
-DISTFILES+=	${PORTNAME}.${PORTVERSION}${EXTRACT_SUFX}	\
-		${PORTNAME}-missing.${PORTVERSION}${EXTRACT_SUFX}
-MD5_FILE=	${MASTERDIR}/distinfo.src
-
+USE_XORG=	x11 xmu xext
+USE_GL=		glut
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	${OPSYS}
 MAKE_ENV=	WRKSRC="${WRKSRC}" ARCHI=${OPSYS} ARCH=${ARCH} OSREL=${OSREL}
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	# nada
-MISSING_FILES=	eigenv.c libmesh3.c libmesh3.h
-
-.else
-# We are not allowed to distribute the sources.
-DISTFILES+=	${PORTNAME}-${ARCH}-${DISTVER}-${PORTVERSION}${EXTRACT_SUFX}
-NO_BUILD=	yes
-PATCHDIR=	# No patches
-ONLY_FOR_ARCHS=	amd64 i386 ia64 sparc64	# Ask the maintainer to add one
+LIBVERSION=	2010.05.20
+SOURCETARB=	${PORTNAME}.${PORTVERSION}${EXTRACT_SUFX}
+LIBTARBALL=	library.${LIBVERSION}${EXTRACT_SUFX}
 
 PLIST_FILES=	bin/${PORTNAME}
 
-. if !defined(NOPORTDOCS)
-DISTFILES+=	meshes.tar.gz:author
+. if !defined(NOPORTEXAMPLES)
+DISTFILES+=	meshes.tar.gz
+EXTRACT_ONLY+=	meshes.tar.gz
 MESHES=		DEFAULT.medit ozark.gis part.bb part.mesh thepart.mesh
 PLIST_FILES+=	${MESHES:S|^|%%EXAMPLESDIR%%/|}
 PLIST_DIRS=	%%EXAMPLESDIR%%
 . endif
-.endif
-
-NO_WRKSUBDIR=	yes
-USE_GL=		glut
-
-.include <bsd.port.pre.mk>
-
-. if ${OSVERSION} < 601000
-.  if ${ARCH} == i386
-DISTVER=	4.11
-LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
-.  else
-BROKEN=		no binary available for your platform x version at the moment
-.  endif
-. else
-.  if (${ARCH} == ia64) || (${ARCH} == sparc64)
-DISTVER=	6.2
-.  else
-DISTVER=	6.1
-.  endif
-. endif
-
-.if defined(MAINTAINER_MODE)
 
 post-extract:
-. for mf in ${MISSING_FILES}
-.  if !exists(${WRKSRC}/sources/${mf})
-	${CP} ${WRKSRC}/${mf} ${WRKSRC}/sources
-.  endif
-. endfor
+	cd ${WRKDIR} &&	\
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${LIBTARBALL} ${EXTRACT_AFTER_ARGS} --exclude ${MAKEFILE}
 
 pre-build:
 	${MKDIR} ${WRKSRC}/bin/${ARCH}/${OSREL}
 
-tarball:
-	cd ${WRKSRC} && \
-	${TAR} cvfz ${_DISTDIR}${PORTNAME}-${ARCH}-${OSREL}-${PORTVERSION}${EXTRACT_SUFX}\
-		bin/${ARCH}/${OSREL}
-
-.else	# !MAINTAINER_MODE
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${ARCH}/${DISTVER}/${PORTNAME} ${PREFIX}/bin
-. if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${MESHES:S|^|${WRKSRC}/INRIA.dir/|} ${EXAMPLESDIR}
-. endif
-
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/medit/distinfo b/science/medit/distinfo
index 72192237cec0..e6bef0c5d977 100644
--- a/science/medit/distinfo
+++ b/science/medit/distinfo
@@ -1,18 +1,9 @@
-MD5 (medit-amd64-6.1-2006.09.24.tgz) = 09778a3ad58b1551db4c7179cae9bf27
-SHA256 (medit-amd64-6.1-2006.09.24.tgz) = e781edf352044a9c1e627e312efde8c08e8f91d776bd022b4a22386d480622e2
-SIZE (medit-amd64-6.1-2006.09.24.tgz) = 152753
-MD5 (medit-i386-4.11-2006.09.24.tgz) = f4d938e6dca0ef82556833ac975d3e90
-SHA256 (medit-i386-4.11-2006.09.24.tgz) = dab78485e91b021482333ef37bfdaf0b99ae7ea70d6d3d7f4edf873f659831c6
-SIZE (medit-i386-4.11-2006.09.24.tgz) = 124381
-MD5 (medit-i386-6.1-2006.09.24.tgz) = 04335b034cf158b10849347650572c7a
-SHA256 (medit-i386-6.1-2006.09.24.tgz) = 8205fca318213cc0afcad383bca8f08e023ee26da0195101d039760111d881a8
-SIZE (medit-i386-6.1-2006.09.24.tgz) = 141483
-MD5 (medit-ia64-6.2-2006.09.24.tgz) = 46e439dcf205a2bdb36a4afcce2812b1
-SHA256 (medit-ia64-6.2-2006.09.24.tgz) = 7ddcc3531c6a62a00280d0859120e0ba15cceaa2499e72dd90732274663976ca
-SIZE (medit-ia64-6.2-2006.09.24.tgz) = 253122
-MD5 (medit-sparc64-6.2-2006.09.24.tgz) = 84695c2859f98e882107c97fba91ff60
-SHA256 (medit-sparc64-6.2-2006.09.24.tgz) = e7177150c00b2f150ea990169329319d5168134540c72f17b2bdd53dfce9f34e
-SIZE (medit-sparc64-6.2-2006.09.24.tgz) = 158158
+MD5 (medit.2010.06.14.tgz) = 099d82412640043798f5a1c90739f21e
+SHA256 (medit.2010.06.14.tgz) = 0461a57bca662bf32eb50402e37fdd58970e2cd67d686da36280413c57e6abc1
+SIZE (medit.2010.06.14.tgz) = 206859
+MD5 (library.2010.05.20.tgz) = b40709007aa1e76242485dc99c0241d3
+SHA256 (library.2010.05.20.tgz) = 47c00e3683b7a4919684003f000de45df7a262743956a4634e11ee70058cd0ca
+SIZE (library.2010.05.20.tgz) = 27075
 MD5 (meshes.tar.gz) = 06b0460d188b105431e5268bc6f36cf1
 SHA256 (meshes.tar.gz) = 643869e1d797bf5c40024465d323ea3ae10477e687b6625be3f880cc6743298b
 SIZE (meshes.tar.gz) = 2136831
diff --git a/science/medit/distinfo.src b/science/medit/distinfo.src
deleted file mode 100644
index a42134db9ab3..000000000000
--- a/science/medit/distinfo.src
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (medit.2006.09.24.tgz) = a80c200cbb38985b5949c98aafdb5e43
-SHA256 (medit.2006.09.24.tgz) = d2b0843de0e1a7c056c5aeeb32bd22ef5a82fcfdcbd4230b6ad229b45d558af7
-SIZE (medit.2006.09.24.tgz) = 217236
-MD5 (medit-missing.2006.09.24.tgz) = a10a1bc657eb3bc21f1497b11cfb5463
-SHA256 (medit-missing.2006.09.24.tgz) = 99ede51b37d15037b9100abcba9190c7e0cd19f1742b4c45fa5672b994b4edb2
-SIZE (medit-missing.2006.09.24.tgz) = 9940
diff --git a/science/medit/files/patch-makefile b/science/medit/files/patch-makefile
index 0612fe6b02b8..dc48b5cdc692 100644
--- a/science/medit/files/patch-makefile
+++ b/science/medit/files/patch-makefile
@@ -1,18 +1,17 @@
---- makefile.orig	Tue Apr 11 13:05:23 2006
-+++ makefile	Sun Sep 24 16:43:05 2006
-@@ -4,6 +4,7 @@
+--- makefile.orig	2008-12-15 20:17:56.000000000 +0100
++++ makefile	2010-10-16 20:05:32.000000000 +0200
+@@ -3,6 +3,7 @@
+ 
  default:
  	@echo "Type one of the following:"
- 	@echo "  make macosx       for Apple Mac OS X"
 +	@echo "  make FreeBSD      for FreeBSD"
- 	@echo "  make linux        for Linux on Intel systems"
- 	@echo "  make win32        for Windows XP"
- 	@echo "  make hpux10       for HP systems with HPUX 10.x w/OpenGL"
-@@ -23,6 +24,16 @@
- 	"GLUT_LIB = -framework GLUT \
- 	            -framework OpenGL -framework Cocoa" \
-         "EXEDIR = /Applications/medit.app/Contents/MacOS"
-+
+ 	@echo "  make macosx       for Apple Mac OS X"
+ 	@echo "  make macosx-x64   for Apple Mac OS X 64 bits"
+ 	@echo "  make macosx-ub    for Apple Mac OS X Universal binary"
+@@ -52,6 +53,16 @@
+ 			    -framework OpenGL -framework Cocoa" \
+ 	"EXEDIR = /Applications/medit.app/Contents/MacOS"
+ 
 +FreeBSD:
 +	$(MAKE) $(MFLAGS) -f Makefile.arch \
 +        "prog   = medit" \
@@ -21,7 +20,8 @@
 +        "GL_LIB   = -lGL" \
 +	"GLU_LIB  = -lGLU" \
 +	"GLUT_LIB = -lglut" \
-+        "EXEDIR = $(WRKSRC)/bin/$(ARCH)/$(OSREL)"
- 
++        "EXEDIR = $(WRKSRC)/bin"
++
  linux:
  	$(MAKE) $(MFLAGS) -f Makefile.arch \
+         "prog   = medit-2.3-linux"\
diff --git a/science/medit/files/patch-sources_medit.h b/science/medit/files/patch-sources_medit.h
new file mode 100644
index 000000000000..decc6dfb66d4
--- /dev/null
+++ b/science/medit/files/patch-sources_medit.h
@@ -0,0 +1,9 @@
+--- sources/medit.h.orig	2007-11-30 16:31:20.000000000 +0100
++++ sources/medit.h	2010-10-17 14:53:46.000000000 +0200
+@@ -88,4 +88,4 @@
+ 
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/science/medit/pkg-descr b/science/medit/pkg-descr
index e4eaf643be61..e0f5732424be 100644
--- a/science/medit/pkg-descr
+++ b/science/medit/pkg-descr
@@ -6,4 +6,4 @@ fluids, thermics, electromagnetism, etc.) on grids 2d (triangles and
 quadrangles), 3d (tetrahedrons or hexahedrons) or surfaces (triangles and
 quandrangles).
 
-WWW: http://www.ann.jussieu.fr/~frey/logiciels/medit.html
+WWW: http://www.ann.jussieu.fr/~frey/software.html#scivis