From owner-freebsd-ports Thu Sep 28 8:21: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C490637B50C for ; Thu, 28 Sep 2000 08:20:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA63800; Thu, 28 Sep 2000 08:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 521FF37B423; Thu, 28 Sep 2000 08:12:53 -0700 (PDT) Message-Id: <20000928151253.521FF37B423@hub.freebsd.org> Date: Thu, 28 Sep 2000 08:12:53 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/21608: Update port: biology/ortep3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21608 >Category: ports >Synopsis: Update port: biology/ortep3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 28 08:20:02 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Fix MASTER_SITES/DISTNAME - USEPGPLOT -> WITH_PGPLOT - Support FFLAGS/X11BASE properly Remove file: files/patch-ab No responce from maintainer. >How-To-Repeat: >Fix: diff -urN /usr/ports/biology/ortep3/Makefile biology/ortep3/Makefile --- /usr/ports/biology/ortep3/Makefile Mon Jul 3 20:54:04 2000 +++ biology/ortep3/Makefile Fri Sep 1 01:12:33 2000 @@ -8,46 +8,46 @@ PORTNAME= ortep3 PORTVERSION= 1.0.3 CATEGORIES= biology -#MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/ -# ftp://ftp.ornl.gov/pub/ortep/src/ -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR=alex -DISTFILES= ortep-1.0.3.tar.Z ortep-1.0.3.f -DISTNAME= ortep -EXTRACT_ONLY= ortep-1.0.3.tar.Z +MASTER_SITES= ftp://ftp.ccl.net/pub/chemistry/software/SOURCES/FORTRAN/ortep/ \ + ftp://ftp.ornl.gov/pub/ortep/src/ +DISTFILES= ortep.tar.Z ortep.f +EXTRACT_ONLY= ortep.tar.Z MAINTAINER= rmiya@cc.hirosaki-u.ac.jp +.if defined(WITH_PGPLOT) LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot +.endif -WRKSRC= ${WRKDIR}/${DISTNAME}/src +WRKSRC= ${WRKDIR}/ortep/src -post-extract: - ${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0 - ${CP} ${DISTDIR}/ortep-${PORTVERSION}.f ${WRKSRC}/ortep.f +MAKE_ARGS= FFLAGS="${FFLAGS}" LFLAGS="${LFLAGS}" -pre-patch: - ${CP} ${FILESDIR}/Makefile.ortep3 ${WRKDIR}/${DISTNAME}/src/Makefile -.if defined(USEPGPLOT) - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-aa - cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-ab +.if defined(WITH_PGPLOT) +EXTRA_PATCHES= ${FILESDIR}/patch-aa +LFLAGS= "-L${LOCALBASE}/lib -lpgplot -L${X11BASE}/lib -lX11" .endif -pre-install: - ${MKDIR} ${PREFIX}/share/doc/ortep3 - ${MKDIR} ${PREFIX}/share/doc/ortep3/examples - ${MKDIR} ${PREFIX}/share/doc/ortep3/man - ${MKDIR} ${PREFIX}/share/doc/ortep3/src +post-extract: + ${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0 + ${CP} ${DISTDIR}/ortep.f ${WRKSRC}/ortep.f + +pre-build: + ${CP} ${FILESDIR}/Makefile.ortep3 ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/* \ - ${PREFIX}/share/doc/ortep3/examples - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/man/* \ - ${PREFIX}/share/doc/ortep3/man - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/src/000readme.txt \ - ${PREFIX}/share/doc/ortep3/src - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README.1st \ - ${PREFIX}/share/doc/ortep3 + @${MKDIR} ${PREFIX}/share/doc/ortep3 + ${INSTALL_DATA} ${WRKSRC}/../README.1st \ + ${PREFIX}/share/doc/ortep3 + @${MKDIR} ${PREFIX}/share/doc/ortep3/examples + ${INSTALL_DATA} ${WRKSRC}/../examples/* \ + ${PREFIX}/share/doc/ortep3/examples + @${MKDIR} ${PREFIX}/share/doc/ortep3/man + ${INSTALL_DATA} ${WRKSRC}/../man/* \ + ${PREFIX}/share/doc/ortep3/man + @${MKDIR} ${PREFIX}/share/doc/ortep3/src + ${INSTALL_DATA} ${WRKSRC}/000readme.txt \ + ${PREFIX}/share/doc/ortep3/src .include diff -urN /usr/ports/biology/ortep3/files/md5 biology/ortep3/files/md5 --- /usr/ports/biology/ortep3/files/md5 Mon Jun 12 18:47:16 2000 +++ biology/ortep3/files/md5 Thu Aug 31 23:32:22 2000 @@ -1,2 +1,2 @@ -MD5 (ortep-1.0.3.tar.Z) = c183517406eda8854399287042dac075 -MD5 (ortep-1.0.3.f) = 9af12582aa95d9cc21f18883c2afea20 +MD5 (ortep.tar.Z) = c183517406eda8854399287042dac075 +MD5 (ortep.f) = 9af12582aa95d9cc21f18883c2afea20 diff -urN /usr/ports/biology/ortep3/files/patch-ab biology/ortep3/files/patch-ab --- /usr/ports/biology/ortep3/files/patch-ab Mon Jun 12 18:47:17 2000 +++ biology/ortep3/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ -*** Makefile Sat May 8 20:23:01 1999 ---- Makefile.pgplot Sat May 8 20:37:41 1999 -*************** -*** 3,9 **** - SRC= ortep.f - OBJ= ortep.o - FFLAGS= -O2 -! LFLAGS= - - all: ${OBJ} - ${FC} ${OBJ} ${LFLAGS} -o ${TARGET} ---- 3,9 ---- - SRC= ortep.f - OBJ= ortep.o - FFLAGS= -O2 -! LFLAGS= -L/usr/local/lib -lpgplot -L/usr/X11R6/lib -lX11 - - all: ${OBJ} - ${FC} ${OBJ} ${LFLAGS} -o ${TARGET} diff -urN /usr/ports/biology/ortep3/pkg/DESCR biology/ortep3/pkg/DESCR --- /usr/ports/biology/ortep3/pkg/DESCR Mon Jun 12 18:47:18 2000 +++ biology/ortep3/pkg/DESCR Fri Sep 1 01:07:45 2000 @@ -3,7 +3,7 @@ (1) If you can use `pgplot' as screen drawing routine, type - % make USEPGPLOT=yes + % make WITH_PGPLOT=yes (2) If you are not familier to `pgplot', note the followings: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message