From owner-freebsd-ports  Tue Oct 10 11:20:12 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 B4F9537B66D
	for <freebsd-ports@FreeBSD.org>; Tue, 10 Oct 2000 11:20:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id LAA29215;
	Tue, 10 Oct 2000 11:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4E8837B502; Tue, 10 Oct 2000 11:18:12 -0700 (PDT)
Message-Id: <20001010181812.C4E8837B502@hub.freebsd.org>
Date: Tue, 10 Oct 2000 11:18:12 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/21894: Update port: biology/ortep3
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         21894
>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:   Tue Oct 10 11:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
It seems ports/21608 was not processed correctly as I intended.
Following patch is needed for fixing.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/biology/ortep3/Makefile biology/ortep3/Makefile
--- /usr/ports/biology/ortep3/Makefile	Wed Oct 11 02:04:31 2000
+++ biology/ortep3/Makefile	Wed Oct 11 02:10:00 2000
@@ -22,31 +22,33 @@
 
 WRKSRC=		${WRKDIR}/ortep/src
 
+MAKE_ARGS=	FFLAGS="${FFLAGS}" LFLAGS="${LFLAGS}"
+
+.if defined(WITH_PGPLOT)
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa
+LFLAGS=		-L${LOCALBASE}/lib -lpgplot -L${X11BASE}/lib -lX11
+.endif
+
 post-extract:
 	${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0
 	${CP} ${DISTDIR}/ortep.f ${WRKSRC}/ortep.f
 
-pre-patch:
+pre-build:
 	${CP} ${FILESDIR}/Makefile.ortep3 ${WRKSRC}/Makefile
-.if defined(USEPGPLOT)
-	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/extra-patch-aa
-.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
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/ortep/examples/* \
-	      ${PREFIX}/share/doc/ortep3/examples
-	${INSTALL_DATA} ${WRKDIR}/ortep/man/* \
-	      ${PREFIX}/share/doc/ortep3/man
-	${INSTALL_DATA} ${WRKDIR}/ortep/src/000readme.txt \
-	      ${PREFIX}/share/doc/ortep3/src
-	${INSTALL_DATA} ${WRKDIR}/ortep/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 <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message