3 files changed, 18 insertions, 84 deletions

diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index ec84f8964f0e..e8063b34a276 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdrawchem
-PORTVERSION=	0.99.7
+PORTVERSION=	1.7.3
 CATEGORIES=	biology
 MASTER_SITES=	http://www.prism.gatech.edu/~gte067k/xdrawchem/
 EXTRACT_SUFX=	.tgz
@@ -14,39 +14,24 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Chemical drawing program
 
-MAKE_ENV=	QTDIR="${X11BASE}"
-PLIST=		${WRKDIR}/pkg-plist
+CFLAGS+=	-O0
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+GNU_CONFIGURE=	yes
+QTCFGLIBS+=	${PTHREAD_LIBS}
+QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 USE_GMAKE=	yes
-USE_QT_VER=	2
+USE_QT_VER=	3
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
-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_CMD} bin/xdrawchem > ${PLIST}
-	${LS} ${WRKSRC}/ring | \
-		${SED} -e 's:^:share/xdrawchem/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm share/xdrawchem >> ${PLIST}
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${LS} *txt | \
-		${SED} -e 's:^:share/doc/xdrawchem/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm share/doc/xdrawchem >> ${PLIST}
-	${LS} ${WRKSRC}/save | \
-		${SED} -e 's:^:share/examples/xdrawchem/:' >> ${PLIST}
-	${ECHO_CMD} @dirrm share/examples/xdrawchem >> ${PLIST}
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xdrawchem ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ring/* ${DATADIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/save/* ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/*txt ${DOCSDIR}
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CPPFLAGS = -I/usr/X11R6/include|CPPFLAGS = @CPPFLAGS@|g ; \
+		 s|^CXXFLAGS = -g|CXXFLAGS = @CXXFLAGS@|g' \
+			${WRKSRC}/xdrawchem/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g' ${WRKSRC}/xdrawchem/application_ob.cpp
+	@${REINPLACE_CMD} -e \
+		's|lround|(long int)rint|g' ${WRKSRC}/xdrawchem/*.cpp
 
 .include <bsd.port.mk>
diff --git a/biology/xdrawchem/distinfo b/biology/xdrawchem/distinfo
index 3011d37c8ad7..d2c5ae9ffb30 100644
--- a/biology/xdrawchem/distinfo
+++ b/biology/xdrawchem/distinfo
@@ -1 +1 @@
-MD5 (xdrawchem-0.99.7.tgz) = b6ce1837704771e329055f283d814f35
+MD5 (xdrawchem-1.7.3.tgz) = 44e2df8ef455b520e31eafcb9a038984
diff --git a/biology/xdrawchem/files/patch-aa b/biology/xdrawchem/files/patch-aa
deleted file mode 100644
index 6f5e520962c5..000000000000
--- a/biology/xdrawchem/files/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
---- Makefile.orig	Sat Dec  1 10:36:43 2001
-+++ Makefile	Sat Jan 19 16:07:48 2002
-@@ -1,26 +1,25 @@
- # XDrawChem configuration stuff
- # INSTDIR: The directory where the binary will go.  Should be in your path.
--#          The default is /usr/local/bin
-+#          The default is ${PREFIX}/bin
- # INSTRING: The directory where you will store ring templates (without quotes).
- # RINGDIR: The directory where you will store ring templates (with quotes).
- # INSTRING and RINGDIR should be the same :)
--# Default should be /usr/local/lib/xdrawchem
-+# Default should be ${PREFIX}/lib/xdrawchem
- # if you change RINGDIR, remember to put "\" before the directory,
- # and \"" after it, so the preprocessor will insert quotes correctly
- # SERVER: database server.  OK to set to "herger.ibb.gatech.edu";
- #         as of version 0.98, there are no other servers  :)
- 
--INSTDIR = /usr/local/bin
--INSTRING = /usr/local/lib/xdrawchem
--RINGDIR = "\"/usr/local/lib/xdrawchem/\""
-+INSTDIR = ${PREFIX}/bin
-+INSTRING = ${PREFIX}/share/xdrawchem
-+RINGDIR = "\"${PREFIX}/share/xdrawchem/\""
- SERVER = "\"herger.ibb.gatech.edu\""
- 
- ## Platform-specific flags -- uncomment appropriate section
- ## For Linux, SGI IRIX 6.5 using gcc/g++
--CXX	=	g++
--INCPATH =	-I/usr/include -I$(QTDIR)/include
--LIBS	=	-lqt -lXext -lX11 -lm
--MOC	=	$(QTDIR)/bin/moc
-+INCPATH =	-I$(QTDIR)/include/qt2
-+LIBS	=	-lqt2 -lXext -lX11 -lm
-+MOC	=	$(QTDIR)/bin/moc2
- 
- ## for Sun
- #CXX	=	CC
-@@ -37,10 +36,9 @@
- ## end of platform-specific flags
- 
- ## other compiler flags
--CXXFLAGS = -g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
--CC	=	gcc
--CFLAGS	=	-g -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
--LFLAGS	=	-g -L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
-+CXXFLAGS += -DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
-+CFLAGS	+=	-DRINGHOME=$(RINGDIR) -DXDC_SERVER=$(SERVER)
-+LFLAGS	+=	-L$(QTDIR)/lib -L/usr/lib -L/usr/X11R6/lib
- 
- 
- ####### Target