Update to version 1.0.3

PR:		19094
Submitted by:	maintainer

While I'm hear, clean up the port, e.g.:
* Don't create/delete PATCHDIR while building this port
* put the distfile, which is unversioned, to my local-distfiles space.
* remove/reorder some actions, such as stripping twice.

Reviewed by:	will

4 files changed, 23 insertions, 24 deletions

diff --git a/biology/ortep3/Makefile b/biology/ortep3/Makefile
index 986cf1ae11f5..340d7fc05dca 100644
--- a/biology/ortep3/Makefile
+++ b/biology/ortep3/Makefile
@@ -6,47 +6,46 @@
 #
 
 PORTNAME=	ortep3
-PORTVERSION=	1.0
+PORTVERSION=	1.0.3
 CATEGORIES=	biology
-MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/
+#MASTER_SITES=	ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/ 
+#		ftp://ftp.ornl.gov/pub/ortep/src/
+MASTER_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/alex/
+DISTFILES=	ortep-1.0.3.tar.Z ortep-1.0.3.f
 DISTNAME=	ortep
-EXTRACT_SUFX=	.tar.Z
+EXTRACT_ONLY=	ortep.tar.Z
 
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
 LIB_DEPENDS=	pgplot.5:${PORTSDIR}/graphics/pgplot
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
 .include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400002
+
+.if ${OSVERSION} >= 400002 && ${OSVERSION} < 400018
 BROKEN=	doesn\'t build with new f77 compiler
 .endif
 
+post-extract:
+	${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0
+	${CP} ${DISTDIR}/ortep-${PORTVERSION}.f ${WRKSRC}/ortep.f
+
 pre-patch:
 	${CP} ${FILESDIR}/Makefile.ortep3 ${WRKDIR}/${DISTNAME}/src/Makefile
 .if defined(USEPGPLOT)
-	${CP} ${FILESDIR}/patch-aa ${PATCHDIR}/
-	${CP} ${FILESDIR}/patch-ab ${PATCHDIR}/
+	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-aa
+	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-ab
 .endif
 
-post-patch:
-.if defined(USEPGPLOT)
-	${RM} ${PATCHDIR}/patch-aa
-	${RM} ${PATCHDIR}/patch-ab
-.endif
-
-do-build:
-	(cd ${WRKDIR}/${DISTNAME}/src && ${MAKE} all)
-
 pre-install:
-	strip ${WRKDIR}/${DISTNAME}/src/ortep3
-	${RM} -rf ${PREFIX}/share/doc/ortep3
 	${MKDIR} ${PREFIX}/share/doc/ortep3
 	${MKDIR} ${PREFIX}/share/doc/ortep3/examples
 	${MKDIR} ${PREFIX}/share/doc/ortep3/man
 	${MKDIR} ${PREFIX}/share/doc/ortep3/src
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/src/ortep3 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/* \
 	      ${PREFIX}/share/doc/ortep3/examples
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/man/* \
diff --git a/biology/ortep3/distinfo b/biology/ortep3/distinfo
index 518b17c7c9d7..69dbe6ae293a 100644
--- a/biology/ortep3/distinfo
+++ b/biology/ortep3/distinfo
@@ -1 +1,2 @@
-MD5 (ortep.tar.Z) = c183517406eda8854399287042dac075
+MD5 (ortep-1.0.3.tar.Z) = c183517406eda8854399287042dac075
+MD5 (ortep-1.0.3.f) = 9af12582aa95d9cc21f18883c2afea20
diff --git a/biology/ortep3/files/extra-patch-aa b/biology/ortep3/files/extra-patch-aa
index 05b44277b112..819571fc46b9 100644
--- a/biology/ortep3/files/extra-patch-aa
+++ b/biology/ortep3/files/extra-patch-aa
@@ -1,5 +1,5 @@
-*** src/ortep.f	Tue Apr  2 01:34:17 1996
---- src/ortep.f.pgplot	Sat May  8 20:35:22 1999
+*** ortep.f	Tue Apr  2 01:34:17 1996
+--- ortep.f.pgplot	Sat May  8 20:35:22 1999
 ***************
 *** 5342,5366 ****
   c *** DUMMY SCREEN OUTPUT (MAY BE REPLACED WITH SCREEN DRIVER CODE)
diff --git a/biology/ortep3/pkg-descr b/biology/ortep3/pkg-descr
index d1e52f313af9..5b8081a655f8 100644
--- a/biology/ortep3/pkg-descr
+++ b/biology/ortep3/pkg-descr
@@ -11,7 +11,7 @@ Structure Illustrations.
   run pgdisp server and setenv PGPLOT_DEV as
 
     % pgdisp &
-    % setenv PGPLOT_DEV /xdisp
+    % setenv PGPLOT_DEV /xwindow
 
   then you can see the ortep-drawing on a pgplot window.
 
@@ -19,5 +19,4 @@ Examples and documentation or on the web site.
 
 WWW: http://www.ornl.gov/ortep/ortep.html
 
---
-rmiya
+- Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>