3 files changed, 87 insertions, 81 deletions

diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 315047a9abfd..a8374733c039 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	raster3d
-DISTVERSION=	2.7d
-PORTREVISION=	2
+PORTVERSION=	2.7s
 CATEGORIES=	graphics biology
 MASTER_SITES=	http://skuld.bmsc.washington.edu/${PORTNAME}/
-DISTNAME=	Raster3D_${DISTVERSION}
+DISTNAME=	Raster3D_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of tools for generating raster images of proteins and molecules
@@ -18,55 +17,62 @@ COMMENT=	A set of tools for generating raster images of proteins and molecules
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-BINARIES=	avs2ps balls rastep render ribbon rings3d rods normal3d
-SCRIPTS=	label3d stereo3d
+OPTIONS=	IMAGEMAGICK "ImageMagick graphics support" on
 
-USE_FORTRAN=	g77
+USE_FORTRAN=	yes
+MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}" FC="${FC}" FFLAGS="${FFLAGS}" \
+		RM="${RM}" OS="${OPSYS}"
+ALL_TARGET=	strip-for-g77 all
 
-.if !defined(WITHOUT_IMAGEMAGICK)
+MANL=		avs2ps.l balls.l label3d.l r3d_objects.l r3dtops.l rastep.l \
+		raster3d.l render.l ribbon.l rods.l normal3d.l stereo3d.l
+
+CFLAGS+=	-DLINUX -DNETWORKBYTEORDER
+FFLAGS+=	-fno-range-check
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile with GCC 4.2: internal compiler error
+.endif
+.endif
+
+.if defined(WITHOUT_IMAGEMAGICK)
+PLIST_SUB+=	IMAGEMAGICK="@comment "
+.else
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+CFLAGS+=	-DIMAGEPIPE
 PLIST_SUB+=	IMAGEMAGICK=""
-.else
-PLIST_SUB+=	IMAGEMAGICK="@comment "
 .endif
 
-MANL=		avs2ps.l label3d.l r3d_objects.l rastep.l render.l rods.l  \
-		balls.l normal3d.l r3dtops.l raster3d.l ribbon.l stereo3d.l
-
-pre-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} freebsd
-	@${REINPLACE_CMD} -e 's#prefix#PREFIX#g' \
-	                  -e 's#^LIBDIRS.*=.*#LIBDIRS	= -L${LOCALBASE}/lib#g' \
-	                  -e 's#^INCDIRS.*=.*#INCDIRS	= -I/usr/include -I${LOCALBASE}/include#g' \
-	                  ${WRKSRC}/Makefile*
+do-configure:
+	@cd ${WRKSRC}; ${SED} 's:^prefix.*$$:prefix = ${PREFIX}:g ; \
+		 s:^INCDIRS.*$$:INCDIRS = -I${LOCALBASE}/include:g ; \
+		 s:^LIBDIRS.*$$:LIBDIRS = -L${LOCALBASE}/lib:g ; \
+		 s:IDEFS:#IDEFS:g' Makefile.template > Makefile.incl
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINARIES} ${PREFIX}/bin
+.for file in avs2ps balls normal3d rastep render ribbon rings3d rods
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${file} ${PREFIX}/bin
+.endfor
 .if !defined(WITHOUT_IMAGEMAGICK)
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
+.for file in label3d stereo3d
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${file} ${PREFIX}/bin
+.endfor
 .endif
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANL} ${MANLPREFIX}/man/manl
 	@${MKDIR} ${DATADIR}/materials
 	cd ${WRKSRC}/materials && ${INSTALL_DATA} * ${DATADIR}/materials
-
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANL} ${MANLPREFIX}/man/manl
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/html
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} R3D_manual.pdf ${DOCSDIR}
 	cd ${WRKSRC}/html && ${INSTALL_DATA} * ${DOCSDIR}/html
-
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}/msms
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} *.* ${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/msms && ${INSTALL_DATA} * ${EXAMPLESDIR}/msms
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2: internal compiler error
-.endif
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/graphics/raster3d/distinfo b/graphics/raster3d/distinfo
index 2160986d4241..f1e056db25e1 100644
--- a/graphics/raster3d/distinfo
+++ b/graphics/raster3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (Raster3D_2.7d.tar.gz) = 30b284037b0138d328ab1b43328549e6
-SHA256 (Raster3D_2.7d.tar.gz) = b784e0a96679791adc7db2b1767a1011ef742380ee4fc783ecae9971a251eca1
-SIZE (Raster3D_2.7d.tar.gz) = 1724473
+MD5 (Raster3D_2.7s.tar.gz) = bc35e375f6fda5bf5f29c69281e533de
+SHA256 (Raster3D_2.7s.tar.gz) = a5952a26ece4af67ac0b4331601e639055cdafb5622aa778779cd15feb071a1a
+SIZE (Raster3D_2.7s.tar.gz) = 1724766
diff --git a/graphics/raster3d/pkg-plist b/graphics/raster3d/pkg-plist
index b082e38aaf59..06d5cd4f719f 100644
--- a/graphics/raster3d/pkg-plist
+++ b/graphics/raster3d/pkg-plist
@@ -57,47 +57,47 @@ bin/normal3d
 %%PORTDOCS%%%%DOCSDIR%%/html/rods.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stereo3d.html
 %%PORTDOCS%%%%DOCSDIR%%/R3D_manual.pdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/msms/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/msms/msms2r3d.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/msms/msms_example.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/LT.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/README.examples
-%%PORTDOCS%%%%EXAMPLESDIR%%/chaincolours.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/clip.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5.jpeg
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5_matrix.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7_header.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7_helix.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7_labels.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7_tex.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7_titles.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example1.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example1.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.sgi
-%%PORTDOCS%%%%EXAMPLESDIR%%/example3.mol
-%%PORTDOCS%%%%EXAMPLESDIR%%/example3.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example3.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example4.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example5.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example5.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example6.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example6.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example7.jpeg
-%%PORTDOCS%%%%EXAMPLESDIR%%/example7.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/example7.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example8.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/example9.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/gal_srf.r3d.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/header1.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/header2.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/header4.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/header8.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/plane.r3d
-%%PORTDOCS%%%%EXAMPLESDIR%%/sugarG.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/sugarcolours.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/sugars.pdb
-%%PORTDOCS%%%%EXAMPLESDIR%%/transparent.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/msms2r3d.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msms/msms_example.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/LT.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.examples
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chaincolours.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clip.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex5.jpeg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex5_matrix.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_header.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_helix.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_labels.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_tex.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex7_titles.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.sgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.mol
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example5.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example5.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example6.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example6.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.jpeg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example7.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example8.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example9.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gal_srf.r3d.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header1.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header2.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header4.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/header8.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plane.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugarG.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugarcolours.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sugars.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent.r3d
 %%DATADIR%%/materials/2-sided.r3d
 %%DATADIR%%/materials/backdrop_1.r3d
 %%DATADIR%%/materials/backdrop_2.r3d
@@ -149,9 +149,9 @@ bin/normal3d
 %%DATADIR%%/materials/transparent1.r3d
 %%DATADIR%%/materials/white.r3d
 %%DATADIR%%/materials/yellow.r3d
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/msms
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/materials
 @dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/msms
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%