Update to 0.95.

Compile molecule_tools.cpp with -O0 on all architectures, not just
the Alpha, to avoid g++ pessimization.

Submitted by:	Matthew Emmerton <matt@gsicomp.on.ca>

4 files changed, 30 insertions, 27 deletions

diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 8067b6b79fb..a39f42b5574 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -6,25 +6,23 @@
 #
 
 PORTNAME=	xdrawchem
-PORTVERSION=	0.85
+PORTVERSION=	0.95
 CATEGORIES=	biology
 MASTER_SITES=	http://www.prism.gatech.edu/~gte067k/xdrawchem/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	trevor@FreeBSD.org
 
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" QTDIR="${X11BASE}"
+MAKE_ENV=	QTDIR="${X11BASE}"
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 USE_QT_VER=	2
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-O0
-.endif
+pre-build:
+	cd ${WRKSRC}; \
+		${CXX} ${CXXFLAGS} -O0 -c -DRINGHOME="\"${PREFIX}/share/xdrawchem/\"" -I${X11BASE}/include/qt2 -o molecule_tools.o molecule_tools.cpp
 
 pre-install:
 	${ECHO} bin/xdrawchem > ${PLIST}
@@ -37,4 +35,4 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/xdrawchem
 	${INSTALL_DATA} ${WRKSRC}/ring/* ${PREFIX}/share/xdrawchem
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/biology/xdrawchem/distinfo b/biology/xdrawchem/distinfo
index d0992d91c27..4f6a891c031 100644
--- a/biology/xdrawchem/distinfo
+++ b/biology/xdrawchem/distinfo
@@ -1 +1 @@
-MD5 (xdrawchem-0.85.tgz) = 2347ee6c8a9b317df1b5c7885fc0038e
+MD5 (xdrawchem-0.95.tgz) = 901ff4f6295480f707930f856fc14173
diff --git a/biology/xdrawchem/files/patch-aa b/biology/xdrawchem/files/patch-aa
index ba4505a938c..7cca08b2e32 100644
--- a/biology/xdrawchem/files/patch-aa
+++ b/biology/xdrawchem/files/patch-aa
@@ -1,16 +1,23 @@
---- Makefile.orig	Wed Feb  7 10:16:18 2001
-+++ Makefile	Mon Feb 19 07:24:11 2001
-@@ -4,19 +4,19 @@
- # if you change this variable, remember to put "\" before the directory,
+--- Makefile.orig	Mon Jul 23 15:15:37 2001
++++ Makefile	Sun Aug 12 03:17:31 2001
+@@ -8,24 +8,22 @@
+ # if you change RINGDIR, remember to put "\" before the directory,
  # and \"" after it, so the preprocessor will insert quotes correctly
  
+-INSTDIR = /usr/local/bin
+-INSTRING = /usr/local/lib/xdrawchem
 -RINGDIR = "\"/usr/local/lib/xdrawchem/\""
-+RINGDIR = "\"${PREFIX}/share/xdrawchem\""
- #RINGDIR = "\"ring/\""
++INSTDIR = ${PREFIX}/bin
++INSTRING = ${PREFIX}/share/xdrawchem
++RINGDIR = "\"${PREFIX}/share/xdrawchem/\""
  
  ## Compiler stuff
+ ## Uncomment the appropriate compiler line
  
+ ## For Linux, SGI IRIX 6.5 (as tested)
 -CXX	=	g++
+ ## for Sun
+ ##CXX	=	CC
 -CXXFLAGS = -g -DRINGHOME=$(RINGDIR)
 -CC	=	gcc
 -CFLAGS	=	-g -DRINGHOME=$(RINGDIR)
@@ -18,12 +25,10 @@
 -LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 -LIBS	=	-lqt -lXext -lX11 -lm
 -MOC	=	moc
-+CXX	?=	g++
-+CXXFLAGS += -g -DRINGHOME=$(RINGDIR)
-+CC	?=	gcc
-+CFLAGS	+=	-g -DRINGHOME=$(RINGDIR)
++CXXFLAGS += -DRINGHOME=$(RINGDIR)
++CFLAGS	+=	-DRINGHOME=$(RINGDIR)
 +INCPATH =	-I$(QTDIR)/include/qt2
-+LFLAGS	=	-g -L$(QTDIR)/lib
++LFLAGS	=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 +LIBS	=	-lqt2 -lXext -lX11 -lm
 +MOC	=	$(QTDIR)/bin/moc2
  
diff --git a/biology/xdrawchem/pkg-descr b/biology/xdrawchem/pkg-descr
index 06634ebf3a3..48cf5828ced 100644
--- a/biology/xdrawchem/pkg-descr
+++ b/biology/xdrawchem/pkg-descr
@@ -1,10 +1,10 @@
-from the Web page:
+from the Web page and the Freshmeat listing:
 
-XDrawChem is a two-dimensional molecule drawing program.
-It can read and write MDL Molfiles to allow sharing between XDrawChem
-and other chemistry applications.
+XDrawChem is a program for drawing chemical structures in two
+dimensions.  It comes with a library of amino acids and nucleic
+acids.  It can read and write MDL Molfiles, read and write CML
+(Chemical Markup Language), read (some?) ChemDraw XML and binary
+files, and export to EPS.  It can predict 13C NMR and simple IR
+spectra.  It works under Unix or Windows.
 
 WWW:  http://www.prism.gatech.edu/~gte067k/xdrawchem/
-
-Trevor Johnson
-trevor@jpj.net