From 27cb5bc46a19b10856343441692ca8bc3ab1b377 Mon Sep 17 00:00:00 2001 From: perry Date: Fri, 7 Oct 2005 15:13:21 +0000 Subject: update RasMol to 2.7.3 Extensive changelist is at: http://www.bernstein-plus-sons.com/software/rasmol/ --- biology/rasmol/Makefile | 11 +++++------ biology/rasmol/PLIST | 7 ++++--- biology/rasmol/distinfo | 14 +++++++------- biology/rasmol/patches/patch-aa | 32 ++++++++++++++++++-------------- biology/rasmol/patches/patch-ab | 8 ++++---- biology/rasmol/patches/patch-ac | 8 ++++---- 6 files changed, 42 insertions(+), 38 deletions(-) (limited to 'biology') diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 01942b523b0..60bd707ec52 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:48 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/10/07 15:13:21 perry Exp $ -DISTNAME= RasMol_2.7.1 -PKGNAME= rasmol-2.7.1 -PKGREVISION= 1 +DISTNAME= RasMol_2.7.3 +PKGNAME= rasmol-2.7.3 CATEGORIES= biology -MASTER_SITES= ftp://ftp.bernstein-plus-sons.com/software/ +MASTER_SITES= http://www.bernstein-plus-sons.com/software/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.bernstein-plus-sons.com/software/rasmol/ @@ -34,12 +33,12 @@ DEPTHDEF?= -DEIGHTBIT post-patch: ${LN} -sf ${WRKDIR}/${DISTNAME}/doc ${WRKSRC} ${LN} -sf ${WRKDIR}/${DISTNAME}/data ${WRKSRC} - ${GUNZIP_CMD} ${WRKDIR}/${DISTNAME}/doc/rasmol.1.gz cd ${WRKSRC} && ${SED} "s#@@PREFIX@@#${PREFIX}#" rasmol.h > \ rasmol.h.new && ${MV} rasmol.h.new rasmol.h post-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/NOTICE ${PREFIX}/share/doc/rasmol + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/rasmol.1 ${PREFIX}/man/man1 for doc in manualA4.pdf.gz manualA4.ps.gz manualA4.rtf.gz \ manualUS.pdf.gz manualUS.ps.gz manualUS.rtf.gz \ refcardA4.pdf.gz refcardA4.ps.gz \ diff --git a/biology/rasmol/PLIST b/biology/rasmol/PLIST index 36a5dd8ec3f..f9085806ceb 100644 --- a/biology/rasmol/PLIST +++ b/biology/rasmol/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2003/02/25 03:37:23 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/10/07 15:13:21 perry Exp $ bin/rasmol -share/doc/rasmol/rasmol.hlp +man/cat1/rasmol.0 +man/man1/rasmol.1 share/doc/rasmol/NOTICE share/doc/rasmol/manualA4.pdf.gz share/doc/rasmol/manualA4.ps.gz @@ -8,6 +9,7 @@ share/doc/rasmol/manualA4.rtf.gz share/doc/rasmol/manualUS.pdf.gz share/doc/rasmol/manualUS.ps.gz share/doc/rasmol/manualUS.rtf.gz +share/doc/rasmol/rasmol.hlp share/doc/rasmol/refcardA4.pdf.gz share/doc/rasmol/refcardA4.ps.gz share/doc/rasmol/refcardA4.rtf.gz @@ -27,4 +29,3 @@ share/examples/rasmol/IUCR9800028.cif share/examples/rasmol/asprin.alc share/examples/rasmol/pdb2mcg.ent @dirrm share/examples/rasmol -${IMAKE_MAN_DIR}/rasmol.${IMAKE_MANNEWSUFFIX} diff --git a/biology/rasmol/distinfo b/biology/rasmol/distinfo index 5461a6840ae..f3f242f0413 100644 --- a/biology/rasmol/distinfo +++ b/biology/rasmol/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/22 21:28:56 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/10/07 15:13:21 perry Exp $ -SHA1 (RasMol_2.7.1.tar.gz) = 5960b1c397aa13824e6524e97f80493e468f19e6 -RMD160 (RasMol_2.7.1.tar.gz) = 6f34a8cd700dc8e0055009ee61f7fd362666aae3 -Size (RasMol_2.7.1.tar.gz) = 3482749 bytes -SHA1 (patch-aa) = 627dbdee004e58451a76a9394197de5c39dd0ae4 -SHA1 (patch-ab) = c9f829a2c0873dc1eb156efff57ea69f90bdd442 -SHA1 (patch-ac) = 0ec2fbf59a92398e3b514637b686cfff80ee7a19 +SHA1 (RasMol_2.7.3.tar.gz) = 25790653566a1a1971bb3e06964288362d588154 +RMD160 (RasMol_2.7.3.tar.gz) = 3203996bc55930e1e3b63f8e64734ccb77a986fc +Size (RasMol_2.7.3.tar.gz) = 8862988 bytes +SHA1 (patch-aa) = aeb57ef20033e9103c65fced9625a9dbb49ca573 +SHA1 (patch-ab) = f289b9299de47022f4310dc56e4c6b1b6e97e887 +SHA1 (patch-ac) = bbbbf90bac91eeb1347fe8170c0351d31f07afcd diff --git a/biology/rasmol/patches/patch-aa b/biology/rasmol/patches/patch-aa index 955876b679d..93a24454d42 100644 --- a/biology/rasmol/patches/patch-aa +++ b/biology/rasmol/patches/patch-aa @@ -1,13 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/03/13 04:42:00 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2005/10/07 15:13:21 perry Exp $ ---- Imakefile.orig Tue Jul 6 01:48:28 1999 -+++ Imakefile Mon Mar 13 04:25:00 2000 -@@ -60,11 +60,12 @@ - - # DEPTHDEF = -DTHIRTYTWOBIT +--- Imakefile.orig 2005-10-06 17:57:49.000000000 -0400 ++++ Imakefile 2005-10-06 18:01:41.000000000 -0400 +@@ -92,7 +92,7 @@ + DEPTHDEF = -DTHIRTYTWOBIT + #endif + #else +-DEPTHDEF = -DTHIRTYTWOBIT ++# DEPTHDEF = -DTHIRTYTWOBIT # DEPTHDEF = -DSIXTEENBIT --DEPTHDEF = -DEIGHTBIT -+# DEPTHDEF = -DEIGHTBIT + # DEPTHDEF = -DEIGHTBIT + #endif +@@ -108,7 +108,8 @@ # RasMol's on-line help direcory # e.g. /usr/local/lib/rasmol/rasmol.hlp @@ -17,15 +21,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/13 04:42:00 wiz Exp $ -@@ -104,8 +105,9 @@ +@@ -176,8 +177,9 @@ ComplexProgramTarget(rasmol) MakeDirectories(install,$(RASMOLDIR)) - InstallNonExec(rasmol.hlp,$(RASMOLDIR)) --InstallNonExec(data/1crn.pdb,$(RASMOLDIR)) --InstallNonExec(data/3cro.pdb,$(RASMOLDIR)) + InstallNonExec(../doc/rasmol.hlp,$(RASMOLDIR)) +-InstallNonExec(../data/1crn.pdb,$(RASMOLDIR)) +-InstallNonExec(../data/3cro.pdb,$(RASMOLDIR)) +MakeDirectories(install,$(RASMOLDATADIR)) +InstallNonExec(data/1crn.pdb,$(RASMOLDATADIR)) +InstallNonExec(data/3cro.pdb,$(RASMOLDATADIR)) - rasmol.man:: doc/rasmol.1 - ln -s doc/rasmol.1 rasmol.man + rasmol.man:: ../doc/rasmol.1 + ln -s ../doc/rasmol.1 rasmol.man diff --git a/biology/rasmol/patches/patch-ab b/biology/rasmol/patches/patch-ab index aae08d6a852..85aa37cc2e0 100644 --- a/biology/rasmol/patches/patch-ab +++ b/biology/rasmol/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/03/13 04:42:00 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2005/10/07 15:13:21 perry Exp $ ---- cif_ctonum.c.orig Thu Aug 5 23:11:05 1999 -+++ cif_ctonum.c Thu Aug 5 23:11:11 1999 -@@ -168,7 +168,6 @@ +--- cif_ctonum.c.orig 2005-10-06 18:05:48.000000000 -0400 ++++ cif_ctonum.c 2005-10-06 18:07:54.000000000 -0400 +@@ -173,7 +173,6 @@ extern "C" { #endif diff --git a/biology/rasmol/patches/patch-ac b/biology/rasmol/patches/patch-ac index d887f083e87..6d3e45b2c22 100644 --- a/biology/rasmol/patches/patch-ac +++ b/biology/rasmol/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/03/13 04:42:00 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2005/10/07 15:13:21 perry Exp $ ---- rasmol.h.orig Tue Jul 6 01:56:01 1999 -+++ rasmol.h Mon Mar 13 05:00:32 2000 -@@ -103,7 +103,7 @@ +--- rasmol.h.orig 2005-10-06 18:09:35.000000000 -0400 ++++ rasmol.h 2005-10-06 18:10:05.000000000 -0400 +@@ -110,7 +110,7 @@ #endif #if !defined(IBMPC) && !defined(APPLEMAC) && !defined(VMS) -- cgit v1.2.3