pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/molden Add DESTDIR support. Add modular Xorg supp...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c878af5b4401
branches: trunk
changeset: 532387:c878af5b4401
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Aug 17 21:38:23 2007 +0000
description:
Add DESTDIR support. Add modular Xorg support. Update to molden4.6
and remove interactive stage for fetching.
Too many changes to list here, see
ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/HISTORY
diffstat:
misc/molden/Makefile | 30 ++++++++----------------------
misc/molden/PLIST | 7 ++++++-
misc/molden/distinfo | 11 ++++++-----
misc/molden/patches/patch-aa | 33 +++++++++++++++++----------------
misc/molden/patches/patch-ab | 15 +++++++++++++++
5 files changed, 52 insertions(+), 44 deletions(-)
diffs (176 lines):
diff -r 5549eeb44a66 -r c878af5b4401 misc/molden/Makefile
--- a/misc/molden/Makefile Fri Aug 17 21:03:51 2007 +0000
+++ b/misc/molden/Makefile Fri Aug 17 21:38:23 2007 +0000
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/08/17 21:38:23 joerg Exp $
-DISTNAME= molden4.2
+DISTNAME= molden4.6
PKGNAME= ${DISTNAME:S/molden/&-/}
-PKGREVISION= 1
CATEGORIES= misc # chemistry
MASTER_SITES= ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
-EXTRACT_SUFX= .tar.Z
+EXTRACT_SUFX= .tar.gz
MAINTAINER= oishi%ims.ac.jp@localhost
HOMEPAGE= http://www.cmbi.ru.nl/molden/molden.html
COMMENT= Displaying MOLecular DENsity
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
MAKE_FILE= makefile
BUILD_TARGET= molden
USE_LANGUAGES= c fortran
-INTERACTIVE_STAGE= fetch
+INSTALLATION_DIRS= bin share/molden/doc share/molden/test share/molden/utils
LICENSE= molden-license
RESTRICTED= Redistributing Molden by unregistered user is prohibited.
@@ -27,27 +27,13 @@
NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-FETCH_MESSAGE= \
- "Please read the following to learn how to get a copy of Molden:" \
- "" \
- " http://www.cmbi.kun.nl/molden/howtoget.html"; \
- "" \
- "Then put the file:" \
- " ${DISTNAME}${EXTRACT_SUFX}" \
- "into" \
- " ${DISTDIR}" \
-
-INSTALLATION_DIRS= bin
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/molden ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/molden ${DESTDIR}${PREFIX}/bin
for d in doc test utils ; do \
- ${INSTALL_DATA_DIR} ${PREFIX}/share/molden/$${d} ; \
for f in ${WRKSRC}/$${d}/* ; do \
- ${INSTALL_DATA} $${f} ${PREFIX}/share/molden/$${d} ; \
+ ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/molden/$${d} ; \
done ; \
done
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5549eeb44a66 -r c878af5b4401 misc/molden/PLIST
--- a/misc/molden/PLIST Fri Aug 17 21:03:51 2007 +0000
+++ b/misc/molden/PLIST Fri Aug 17 21:38:23 2007 +0000
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 19:15:48 kei Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/17 21:38:23 joerg Exp $
bin/molden
share/molden/doc/figures.ps.Z
share/molden/doc/manual.ps.Z
share/molden/doc/manual.txt.Z
share/molden/test/adf.molf
+share/molden/test/ambfor_amber.xyz
+share/molden/test/ambfor_gaff.xyz
share/molden/test/ampac.arc
share/molden/test/ampac.test
share/molden/test/bucky.xyz
share/molden/test/chemx.test
share/molden/test/complex2.out
+share/molden/test/cpeptide.gro
share/molden/test/esp.test
share/molden/test/esp.txt
share/molden/test/esp.xyz
@@ -28,6 +31,8 @@
share/molden/test/mopac.freq
share/molden/test/mopac.test
share/molden/test/pdb.test
+share/molden/test/pdb.test.omap
+share/molden/test/qchem.test
share/molden/test/reacpth.xyz
share/molden/test/shelx.ins
share/molden/test/surface.molf
diff -r 5549eeb44a66 -r c878af5b4401 misc/molden/distinfo
--- a/misc/molden/distinfo Fri Aug 17 21:03:51 2007 +0000
+++ b/misc/molden/distinfo Fri Aug 17 21:38:23 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/05/25 12:48:57 wiz Exp $
+$NetBSD: distinfo,v 1.7 2007/08/17 21:38:23 joerg Exp $
-SHA1 (molden4.2.tar.Z) = 5377c6670b0ddc8317573a749494bac146d97a8b
-RMD160 (molden4.2.tar.Z) = 05b4ebfbe2795a5d9832512a9ffc3004ea6b76cd
-Size (molden4.2.tar.Z) = 3306529 bytes
-SHA1 (patch-aa) = 62168b37335cc74737c2d967234c0e846ab7bfa3
+SHA1 (molden4.6.tar.gz) = 1664e565c49266fbd2b6e0562c88518074368b09
+RMD160 (molden4.6.tar.gz) = 1e22a68087d46dce0d413f80dd622118b08bfbcb
+Size (molden4.6.tar.gz) = 2679456 bytes
+SHA1 (patch-aa) = d9c83b67b92123acd7f523312d4b9207a8f009ce
+SHA1 (patch-ab) = 34f993d6920086952ced46064e287f2648cbedec
diff -r 5549eeb44a66 -r c878af5b4401 misc/molden/patches/patch-aa
--- a/misc/molden/patches/patch-aa Fri Aug 17 21:03:51 2007 +0000
+++ b/misc/molden/patches/patch-aa Fri Aug 17 21:38:23 2007 +0000
@@ -1,25 +1,26 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 19:15:48 kei Exp $
+$NetBSD: patch-aa,v 1.2 2007/08/17 21:38:23 joerg Exp $
---- makefile.orig Thu Apr 19 20:09:28 2001
-+++ makefile Sat Jun 1 01:14:46 2002
-@@ -13,12 +13,16 @@
+--- makefile.orig 2007-08-11 16:31:46.000000000 +0200
++++ makefile
+@@ -13,8 +13,7 @@
# Disregard compiler warnings on rdmolf.f
#
CC = cc
-LIBS = -lX11 -lm
+-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
+LIBS = -L${X11BASE}/lib -R${X11BASE}/lib -lX11 -lm
-+CFLAGS = -c -I${X11BASE}/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+FC = g77
-+FFLAGS =
-+LDR = g77
# Silicon Graphics
--CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
--FFLAGS =
--LDR = f77
-+#CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+#FFLAGS =
-+#LDR = f77
-
- # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
+ #CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+@@ -48,10 +47,9 @@ LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXm
+ # with GCC4.0 or higher replace the line with:
+ # 'external gfortran_iargc'
#
+-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
++CFLAGS = -c -I${X11BASE}/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+ FC = g77
+ FFLAGS =
+-LIBS = -L/usr/X11R6/lib -lX11 -lm
+ LDR = g77
+ # 64 bit machines:
+ #LIBS = -L/usr/X11R6/lib64 -lX11 -lm
diff -r 5549eeb44a66 -r c878af5b4401 misc/molden/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/molden/patches/patch-ab Fri Aug 17 21:38:23 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/08/17 21:38:23 joerg Exp $
+
+--- xwin.c.orig 2007-08-17 21:07:45.000000000 +0000
++++ xwin.c
+@@ -20,10 +20,6 @@
+ #include <GL/gl.h>
+ #include <GL/glu.h>
+ #endif
+-#if defined(DARWIN) || defined(FREEBSD)
+-#else
+-#include <malloc.h>
+-#endif
+ #endif
+
+ #include <stdio.h>
Home |
Main Index |
Thread Index |
Old Index