From 9ed0e3b493de10c44662c8d24451848c26a5db53 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 21 Mar 2015 19:27:56 +0000 Subject: Honor our CFLAGS. Fix build on systems with linkat. --- misc/molden/distinfo | 6 +-- misc/molden/patches/patch-aa | 8 +-- misc/molden/patches/patch-ab | 116 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 121 insertions(+), 9 deletions(-) diff --git a/misc/molden/distinfo b/misc/molden/distinfo index d51445e40c3..0db263f3779 100644 --- a/misc/molden/distinfo +++ b/misc/molden/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2012/05/20 06:45:54 marino Exp $ +$NetBSD: distinfo,v 1.10 2015/03/21 19:27:56 joerg Exp $ SHA1 (molden-4.6/molden4.6.tar.gz) = 83f17d2079b83cc790689485c139301407313463 RMD160 (molden-4.6/molden4.6.tar.gz) = b75ec4c23001695044e82d9f8b8542cb45b3009c Size (molden-4.6/molden4.6.tar.gz) = 2786093 bytes -SHA1 (patch-aa) = d9c83b67b92123acd7f523312d4b9207a8f009ce -SHA1 (patch-ab) = 34f993d6920086952ced46064e287f2648cbedec +SHA1 (patch-aa) = 6d56ac7e5aa940004b6758164b5eaedbf9694b3c +SHA1 (patch-ab) = a0dad736707c3228f4934e4888ae0d08cbf61338 diff --git a/misc/molden/patches/patch-aa b/misc/molden/patches/patch-aa index 0409a424634..ae7b634a73d 100644 --- a/misc/molden/patches/patch-aa +++ b/misc/molden/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2007/08/17 21:38:23 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2015/03/21 19:27:56 joerg Exp $ ---- makefile.orig 2007-08-11 16:31:46.000000000 +0200 +--- makefile.orig 2008-06-24 13:44:16.000000000 +0000 +++ makefile @@ -13,8 +13,7 @@ # Disregard compiler warnings on rdmolf.f @@ -12,12 +12,12 @@ $NetBSD: patch-aa,v 1.2 2007/08/17 21:38:23 joerg Exp $ # Silicon Graphics #CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 -@@ -48,10 +47,9 @@ LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXm +@@ -52,10 +51,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 ++CFLAGS += -c -I${X11BASE}/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 FC = g77 FFLAGS = -LIBS = -L/usr/X11R6/lib -lX11 -lm diff --git a/misc/molden/patches/patch-ab b/misc/molden/patches/patch-ab index 3679707a26f..c91c435aea0 100644 --- a/misc/molden/patches/patch-ab +++ b/misc/molden/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2007/08/17 21:38:23 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2015/03/21 19:27:56 joerg Exp $ ---- xwin.c.orig 2007-08-17 21:07:45.000000000 +0000 +--- xwin.c.orig 2008-08-30 11:59:22.000000000 +0000 +++ xwin.c @@ -20,10 +20,6 @@ #include @@ -13,3 +13,115 @@ $NetBSD: patch-ab,v 1.1 2007/08/17 21:38:23 joerg Exp $ #endif #include +@@ -3360,7 +3356,7 @@ static int *ispoptm; + static int *icopth; + static int *icoptl; + static int *icoptm; +-static int linkat = 0; ++static int my_linkat = 0; + + static QBOXSTRU IANZboxes[MAXAT]; + static QBOXSTRU IZboxes[MAXAT][4]; +@@ -17466,7 +17462,7 @@ int i; + if (ioniom == 1) { + int ism, isl; + +- linkat = 0; ++ my_linkat = 0; + + /* Counting the number of Link atoms between H and lower + levels*/ +@@ -17479,10 +17475,10 @@ int i; + if (ionij != 0) continue; + nconn = xyz.iconn[j*(MXCON+1)]; + for (k=1;k<=nconn;k++) { +- if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++; ++ if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 > 0) my_linkat++; + } + } +- linkat += 20000; ++ my_linkat += 20000; + *itotc = *icopth; + *imult = *ispopth; + if (CheckChargeMult()) { +@@ -17503,7 +17499,7 @@ int i; + + } else if (ioniom == 2) { + +- linkat = 0; ++ my_linkat = 0; + + /* Counting the number of Link atoms between H and + lower levels*/ +@@ -17513,10 +17509,10 @@ int i; + if(ionij != 0) continue; + nconn = xyz.iconn[j*(MXCON+1)]; + for (k=1;k<=nconn;k++) { +- if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++; ++ if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 > 0) my_linkat++; + } + } +- linkat += 20000; ++ my_linkat += 20000; + *itotc = *icopth; + *imult = *ispopth; + if (CheckChargeMult()) { +@@ -17528,7 +17524,7 @@ int i; + break; + */ + } +- linkat = 0; ++ my_linkat = 0; + + /* Counting the number of Link atoms between H+M and + lower levels*/ +@@ -17538,10 +17534,10 @@ int i; + if (ionij == 2) continue; + nconn = xyz.iconn[j*(MXCON+1)]; + for (k=1;k<=nconn;k++) { +- if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 == 2) linkat++; ++ if (xyz.ityp[xyz.iconn[j*(MXCON+1)+k]-1]/10000 == 2) my_linkat++; + } + } +- linkat += 20000; ++ my_linkat += 20000; + *itotc = *icoptm; + *imult = *ispoptm; + if (CheckChargeMult()) { +@@ -17556,7 +17552,7 @@ int i; + icopt = *icoptl+3; + ispopt = *ispoptl-1; + } +- linkat = 0; ++ my_linkat = 0; + *itotc = icopt - 3; + *imult = ispopt + 1; + *ito = itopt[jmode] + 1; +@@ -17808,10 +17804,10 @@ int CheckChargeMult() + ionil = 0; + + if (ioniom) { +- ionil = 3 - (linkat / 10000); +- linkat -= (linkat / 10000) * 10000; ++ ionil = 3 - (my_linkat / 10000); ++ my_linkat -= (my_linkat / 10000) * 10000; + } else { +- linkat = 0; ++ my_linkat = 0; + } + + if (*zmptr.ihaszm) { +@@ -17834,10 +17830,10 @@ int CheckChargeMult() + } + } + /* +- fprintf(stderr,"ionil %d ne %d itotc %d linkat %d mult %d\n", +- ionil,ne,*itotc,linkat,*imult); ++ fprintf(stderr,"ionil %d ne %d itotc %d my_linkat %d mult %d\n", ++ ionil,ne,*itotc,my_linkat,*imult); + */ +- ne = ne - *itotc + linkat; ++ ne = ne - *itotc + my_linkat; + if (ne % 2 == *imult % 2) return(1); + return(0); + } -- cgit v1.2.3