From 36d7249f846d95a244997b6c1d570854c0bf97f8 Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Mon, 31 Oct 2005 17:53:26 +0000
Subject: MITSHM is not available on Interix, so don't request it.

---
 biology/rasmol/Makefile         |  4 ++--
 biology/rasmol/distinfo         |  4 ++--
 biology/rasmol/patches/patch-ac | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'biology/rasmol')

diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 6d6746e8699..e89955571ee 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/10/07 15:17:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/10/31 17:53:26 tv Exp $
 
 DISTNAME=	RasMol_2.7.3
 PKGNAME=	rasmol-2.7.3
@@ -30,7 +30,7 @@ DEPTHDEF=	-DSIXTEENBIT
 .endif
 DEPTHDEF?=	-DEIGHTBIT
 
-post-patch:
+pre-configure:
 	${LN} -sf ${WRKDIR}/${DISTNAME}/doc  ${WRKSRC}
 	${LN} -sf ${WRKDIR}/${DISTNAME}/data ${WRKSRC}
 	cd ${WRKSRC} && ${SED} "s#@@PREFIX@@#${PREFIX}#" rasmol.h > \
diff --git a/biology/rasmol/distinfo b/biology/rasmol/distinfo
index f3f242f0413..a4ffea7dd2f 100644
--- a/biology/rasmol/distinfo
+++ b/biology/rasmol/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/10/07 15:13:21 perry Exp $
+$NetBSD: distinfo,v 1.5 2005/10/31 17:53:26 tv Exp $
 
 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
+SHA1 (patch-ac) = d025cb02f376844e689b6116607f419af5d2bbab
diff --git a/biology/rasmol/patches/patch-ac b/biology/rasmol/patches/patch-ac
index 6d3e45b2c22..b415838b486 100644
--- a/biology/rasmol/patches/patch-ac
+++ b/biology/rasmol/patches/patch-ac
@@ -1,8 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2005/10/07 15:13:21 perry Exp $
+$NetBSD: patch-ac,v 1.3 2005/10/31 17:53:26 tv Exp $
 
---- 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 @@
+--- rasmol.h.orig	2005-04-28 18:57:25.000000000 -0400
++++ rasmol.h
+@@ -71,7 +71,10 @@
+ #define SOCKETS
+ #define TERMIOS
+ #define PROFILE
++
++#ifndef __INTERIX
+ #define MITSHM
++#endif
+ 
+ /* #define HAVEZLIB     */
+ /* #define HAVELIBJPEG  */
+@@ -110,7 +113,7 @@
  #endif
  
  #if !defined(IBMPC) && !defined(APPLEMAC) && !defined(VMS)
-- 
cgit v1.2.3