respect CXX and CXXFLAGS (Kato Tsuguru)

install data files (Kato Tsuguru)
bump version (myself)
use USE_NEWGCC (Will Andrews)
make whitespace changes to Makefile

PR:		21359
Submitted by:	maintainer

4 files changed, 39 insertions, 20 deletions

diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 2100af1a0f66..a85b1dec5740 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   xdrawchem
-# Date created:        13 April 2000
-# Whom:                Trevor Johnson <trevor@jpj.net>
+# New ports collection makefile for:	xdrawchem
+# Date created:				13 April 2000
+# Whom:					Trevor Johnson <trevor@jpj.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xdrawchem
-PORTVERSION=	0.82
+PORTVERSION=	0.83
 CATEGORIES=	biology
 MASTER_SITES=	http://www.prism.gatech.edu/~gte067k/xdrawchem/
-DISTNAME=	${PORTNAME}
+DISTNAME=	xdc083
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	trevor@jpj.net
 
+MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" QTDIR="${X11BASE}"
+USE_GMAKE=	yes
+USE_NEWGCC=	yes
 USE_QT2=	yes
-
 USE_X_PREFIX=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-MAKE_ENV+=	QTDIR=${X11BASE}
-USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/biology/xdrawchem/distinfo b/biology/xdrawchem/distinfo
index a2157422f0bb..64b4fd35344d 100644
--- a/biology/xdrawchem/distinfo
+++ b/biology/xdrawchem/distinfo
@@ -1 +1 @@
-MD5 (xdrawchem.tgz) = abda33e61e9621b79349c59f80fb15c3
+MD5 (xdc083.tgz) = 40474c547139a86b5852bff5e5b7eafd
diff --git a/biology/xdrawchem/files/patch-aa b/biology/xdrawchem/files/patch-aa
index d1f588be7401..bbc004d108d8 100644
--- a/biology/xdrawchem/files/patch-aa
+++ b/biology/xdrawchem/files/patch-aa
@@ -1,21 +1,37 @@
---- Makefile.orig	Fri Mar 31 03:05:27 2000
-+++ Makefile	Sun Apr 16 12:57:25 2000
-@@ -13,10 +13,10 @@
- CFLAGS	=	-g -DRINGHOME=$(RINGDIR)
+--- Makefile.orig	Thu May 25 03:17:35 2000
++++ Makefile	Mon Sep 18 15:56:32 2000
+@@ -4,21 +4,21 @@
+ # if you change this variable, remember to put "\" before the directory,
+ # and \"" after it, so the preprocessor will insert quotes correctly
+ 
+-RINGDIR = "\"/usr/local/lib/xdrawchem/\""
++RINGDIR = "\"${PREFIX}/share/xdrawchem\""
+ #RINGDIR = "\"ring/\""
+ 
+ ## Compiler stuff
+ 
+-CXX	=	g++
+-CXXFLAGS = -g -DRINGHOME=$(RINGDIR)
+-CC	=	gcc
+-CFLAGS	=	-g -DRINGHOME=$(RINGDIR)
++CXX	?=	g++
++CXXFLAGS += -g -DRINGHOME=$(RINGDIR)
++CC	?=	gcc
++CFLAGS	+=	-DRINGHOME=$(RINGDIR)
  #INCPATH =	-I/usr/include -I/usr/people/herger/src/qt-2.0.2/include
  #LFLAGS	=	-L/usr/src/qt-2.0.2/lib -L/usr/lib
 -INCPATH =	-I/usr/include -I$(QTDIR)/include
 -LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
 -LIBS	=	-lqt -lXext -lX11 -lm
 -MOC	=	moc
-+INCPATH =	-I/usr/include -I$(QTDIR)/include/qt2
-+LFLAGS	=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
++INCPATH =	-I$(QTDIR)/include/qt2
++LFLAGS	=	-L$(QTDIR)/lib
 +LIBS	=	-lqt2 -lXext -lX11 -lm
-+MOC	=	moc2
++MOC	=	$(QTDIR)/bin/moc2
  
  ####### Target
  
-@@ -157,3 +157,7 @@
+@@ -164,3 +164,9 @@
  
  moc_manual.cpp: manual.h
  	$(MOC) manual.h -o moc_manual.cpp
@@ -23,3 +39,5 @@
 +install:
 +	strip -s xdrawchem
 +	install -c -m 755 -o root -g wheel xdrawchem $(X11BASE)/bin/
++	install -d -m 755 -o root -g wheel $(X11BASE)/share/xdrawchem/
++	install -c -m 644 -o root -g wheel ring/* $(X11BASE)/share/xdrawchem/
diff --git a/biology/xdrawchem/pkg-plist b/biology/xdrawchem/pkg-plist
index d6765dee5ce3..9e4056cdb5ed 100644
--- a/biology/xdrawchem/pkg-plist
+++ b/biology/xdrawchem/pkg-plist
@@ -1 +1,4 @@
 bin/xdrawchem
+share/xdrawchem/calix4.ring
+share/xdrawchem/naphthalene.ring
+@dirrm share/xdrawchem