head 1.3; access; symbols pkgsrc-2021Q1:1.2.0.50 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.48 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.46 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.42 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.22 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.44 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.40 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.38 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.36 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.34 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.32 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.30 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.28 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.26 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.24 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.20 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.18 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.16 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.14 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.12 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.10 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.8 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.6 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.4 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.2 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.1.0.64 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.62 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.60 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.58 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.56 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.54 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.52 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.50 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.48 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.46 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.44 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.42 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.40 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.38 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.36 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.34 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.32 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.30 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.28 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.26 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.24 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.22 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.20 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.18 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.16 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.14 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.12 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.10 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.8 pkgsrc-2008Q1:1.1.0.6 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.4 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2021.04.24.08.47.53; author wiz; state dead; branches; next 1.2; commitid lQh289nKtlWXvwQC; 1.2 date 2015.03.21.19.27.56; author joerg; state Exp; branches; next 1.1; commitid Sg3JxnUZDM1QBvey; 1.1 date 2007.08.17.21.38.23; author joerg; state Exp; branches; next ; desc @@ 1.3 log @molden: remove Upstream website gone, the distfile was not re-distributable, and noone had updated it since 2007. @ text @$NetBSD: patch-ab,v 1.2 2015/03/21 19:27:56 joerg Exp $ --- xwin.c.orig 2008-08-30 11:59:22.000000000 +0000 +++ xwin.c @@@@ -20,10 +20,6 @@@@ #include #include #endif -#if defined(DARWIN) || defined(FREEBSD) -#else -#include -#endif #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); } @ 1.2 log @Honor our CFLAGS. Fix build on systems with linkat. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2007/08/17 21:38:23 joerg Exp $ @ 1.1 log @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 @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- xwin.c.orig 2007-08-17 21:07:45.000000000 +0000 d16 112 @