From owner-svn-ports-all@FreeBSD.ORG Fri Nov 30 23:51:49 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A64C5AC9; Fri, 30 Nov 2012 23:51:49 +0000 (UTC) (envelope-from sperber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8C16C8FC08; Fri, 30 Nov 2012 23:51:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUNpnUt079684; Fri, 30 Nov 2012 23:51:49 GMT (envelope-from sperber@svn.freebsd.org) Received: (from sperber@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUNpnRd079679; Fri, 30 Nov 2012 23:51:49 GMT (envelope-from sperber@svn.freebsd.org) Message-Id: <201211302351.qAUNpnRd079679@svn.freebsd.org> From: Armin Pirkovitsch Date: Fri, 30 Nov 2012 23:51:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308042 - in head/biology/molden: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2012 23:51:49 -0000 Author: sperber Date: Fri Nov 30 23:51:49 2012 New Revision: 308042 URL: http://svnweb.freebsd.org/changeset/ports/308042 Log: - Update to version 5.0.2 - Add MAKE_JOBS_UNSAFE - Convert to optionsng PR: ports/171970 Submitted by: KATO Tsuguru Approved by: beat (mentor) Feature safe: yes Deleted: head/biology/molden/files/patch-aa head/biology/molden/files/patch-xwin.c head/biology/molden/pkg-plist Modified: head/biology/molden/Makefile head/biology/molden/distinfo head/biology/molden/files/patch-ambfor-makefile head/biology/molden/files/patch-surf-makefile Modified: head/biology/molden/Makefile ============================================================================== --- head/biology/molden/Makefile Fri Nov 30 23:51:42 2012 (r308041) +++ head/biology/molden/Makefile Fri Nov 30 23:51:49 2012 (r308042) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= molden -PORTVERSION= 4.6 -PORTREVISION= 3 +PORTVERSION= 5.0.2 PORTEPOCH= 1 CATEGORIES= biology MASTER_SITES= ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/ @@ -12,16 +11,35 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Display molecular orbitals and electron densities in 2D and 3D -USE_XORG= x11 xmu -USE_GL= glut -USE_FORTRAN= yes +RESTRICTED= free for academic, non profit usage; do not re-distribute source and executable. -RESTRICTED= free for academic, non profit usage; do not re-distribute source and executable -MAKEFILE= ${WRKSRC}/makefile +OPTIONS_DEFINE= DATA DOCS +OPTIONS_DEFAULT=DATA -.if !defined(NOPORTDOCS) -PORTDOCS= docs/* -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} + +USE_XORG= x11 +USE_GL= glu +USE_FORTRAN= yes +USE_GMAKE= yes +MAKEFILE= makefile +MAKE_JOBS_UNSAFE=yes + +CFLAGS+= -D${OPSYS:U} -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 + +PORTDOCS= * +PORTDATA= * +PLIST_FILES= bin/ambfor bin/gmolden bin/molden bin/surf + +.include + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^CC |#CC | ; \ + s|^FC |#FC | ; \ + s|/usr/X11R6|${LOCALBASE}| ; \ + s|-lXmu|| ; \ + /depend/s|^|#|' ${WRKSRC}/makefile post-configure: @${ECHO_MSG} "********************" @@ -32,17 +50,18 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/molden ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/ambfor/ambfor ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/gmolden ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ambfor/ambfor ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/surf/surf ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} -.endif -.if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR}/test ${DATADIR}/utils +.if ${PORT_OPTIONS:MDATA} + @${MKDIR} ${DATADIR}/test ${INSTALL_DATA} ${WRKSRC}/test/* ${DATADIR}/test + @${MKDIR} ${DATADIR}/utils ${INSTALL_DATA} ${WRKSRC}/utils/* ${DATADIR}/utils .endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} +.endif .include Modified: head/biology/molden/distinfo ============================================================================== --- head/biology/molden/distinfo Fri Nov 30 23:51:42 2012 (r308041) +++ head/biology/molden/distinfo Fri Nov 30 23:51:49 2012 (r308042) @@ -1,2 +1,2 @@ -SHA256 (molden4.6.tar.gz) = e18583d3e3234426b06403b056aed50e98397d6733e3b635c7011725e2816380 -SIZE (molden4.6.tar.gz) = 2786093 +SHA256 (molden5.0.2.tar.gz) = cfe48142fa7f59dfb5f90d63e26ae3d7d29b5ab02c0f9424bceef9f7d27f0709 +SIZE (molden5.0.2.tar.gz) = 3064536 Modified: head/biology/molden/files/patch-ambfor-makefile ============================================================================== --- head/biology/molden/files/patch-ambfor-makefile Fri Nov 30 23:51:42 2012 (r308041) +++ head/biology/molden/files/patch-ambfor-makefile Fri Nov 30 23:51:49 2012 (r308042) @@ -1,17 +1,28 @@ ---- ambfor/makefile.orig 2008-10-30 10:06:37.000000000 +0100 -+++ ambfor/makefile 2008-10-30 10:07:19.000000000 +0100 -@@ -14,11 +14,11 @@ +--- ambfor/makefile.orig 2011-04-29 20:40:50.000000000 +0900 ++++ ambfor/makefile 2012-09-24 02:50:23.000000000 +0900 +@@ -12,12 +12,12 @@ # - #CC = cc + # --CFLAGS = -c --FC = g77 -+CFLAGS += -DFREEBSD=1 -+#FC = g77 - FFLAGS = -c -O3 -ffast-math +-CFLAGS = -c -g ++CFLAGS += -c + #FC = g77 +-FC = gfortran +-FFLAGS = -c -g -ffast-math -funroll-loops -O3 ++#FC = gfortran ++#FFLAGS = -c -g -ffast-math -funroll-loops -O3 LIBS = -lm --LDR = g77 -+LDR = $(FC) +-LDR = ${FC} -g ++LDR = ${FC} - OBJS = ambfor.o angle.o bond.o charge.o conn.o enegrd.o getinp.o \ - param.o tors.o vdwlj.o math.o optimise.o wrtout.o + OBJS = angle.o bond.o charge.o conn.o enegrd.o getinp.o param.o \ + tors.o vdwlj.o math.o switch.o wrtout.o pbc.o +@@ -47,7 +47,7 @@ + $(LDR) -o ambmd md.o verlet.o qvdw.o allocmd.o $(OBJS) $(LIBS) + + ambfor.o: ambfor.f +- ${FC} -c -g -ffast-math -funroll-loops -o ambfor.o ambfor.f ++ ${FC} -c ${FFLAGS} -o ambfor.o ambfor.f + + allocmd.o: alloc.c + $(CC) $(CFLAGS) -DMD -c alloc.c -o allocmd.o Modified: head/biology/molden/files/patch-surf-makefile ============================================================================== --- head/biology/molden/files/patch-surf-makefile Fri Nov 30 23:51:42 2012 (r308041) +++ head/biology/molden/files/patch-surf-makefile Fri Nov 30 23:51:49 2012 (r308042) @@ -1,5 +1,21 @@ ---- surf/Makefile.orig 2008-10-30 10:12:27.000000000 +0100 -+++ surf/Makefile 2008-10-30 10:08:43.000000000 +0100 +--- surf/Makefile.orig 2008-08-26 02:59:06.000000000 +0900 ++++ surf/Makefile 2012-09-24 02:45:55.000000000 +0900 +@@ -1,12 +1,12 @@ + # Compilation flags + #CC = cc +-CC = cc ++#CC = cc + INCLUDE = -I. + #LINCLUDE = -lcurses -ltermcap -lm + LINCLUDE = -lm +-OPT_CFLAGS = -O2 $(FLAGS) $(INCLUDE) ++#OPT_CFLAGS = -O2 $(FLAGS) $(INCLUDE) + #CFLAGS = -g $(FLAGS) $(INCLUDE) +-CFLAGS = -O2 $(FLAGS) $(INCLUDE) ++#CFLAGS = -O2 $(FLAGS) $(INCLUDE) + + # These are the user object files in the application + SRCS = surf.c io.c compute.c dual.c utils.c lp.c chull.c tessel_cases.c \ @@ -63,46 +63,120 @@ # DO NOT DELETE THIS LINE -- make depend depends on it.