- Upgrade to to 1.9.9 and unbreak;

- Take maintainership.

PR:		ports/99072
Submitted by:	Josh Tolbert <hemi (at) puresimplicity.net>

4 files changed, 134 insertions, 146 deletions

diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile
index 98f2d8bf6f44..4ca26b2e2700 100644
--- a/biology/xdrawchem/Makefile
+++ b/biology/xdrawchem/Makefile
@@ -6,39 +6,25 @@
 #
 
 PORTNAME=	xdrawchem
-PORTVERSION=	1.7.8
-PORTREVISION=	1
+PORTVERSION=	1.9.9
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdrawchem
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	Chemical drawing program
 
 LIB_DEPENDS=	openbabel.1:${PORTSDIR}/science/openbabel
 
-BROKEN=		Configure fails
-
-CFLAGS+=	-O0
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
-QTCFGLIBS+=	${PTHREAD_LIBS}
-QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 USE_GMAKE=	yes
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
 
-pre-configure:
-	${MKDIR} ${WRKDIR}
-	${ECHO_CMD} \
-	"Warning:  source code for this version has not been reviewed!" \
-		> ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} 
-	@${ECHO_CMD} Waiting ten seconds--press control-C to cancel build.
-	@sleep 10
+CONFIGURE_ENV=	QTINCDIR="${X11BASE}/include" \
+	QTLIBDIR="${X11BASE}/lib"
+
+MAKE_ARGS+=	LDFLAGS+="-lqt-mt ${PTHREAD_LIBS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/biology/xdrawchem/distinfo b/biology/xdrawchem/distinfo
index 19065d86f298..d8296c579715 100644
--- a/biology/xdrawchem/distinfo
+++ b/biology/xdrawchem/distinfo
@@ -1,3 +1,3 @@
-MD5 (xdrawchem-1.7.8.tgz) = cc3cd5a252924ec187197d4f2ebf7197
-SHA256 (xdrawchem-1.7.8.tgz) = 7a77201c6a44947ac3a86cc520375b4d238ceec39165243a6a9c7fbf5a073048
-SIZE (xdrawchem-1.7.8.tgz) = 970908
+MD5 (xdrawchem-1.9.9.tar.gz) = 6343d031b3ea19a6606831c89b8006b2
+SHA256 (xdrawchem-1.9.9.tar.gz) = 33e45ee8b937ba4ea77fb28adca66195943715a941039a95d0a4bed09d4cf9e3
+SIZE (xdrawchem-1.9.9.tar.gz) = 982481
diff --git a/biology/xdrawchem/pkg-message b/biology/xdrawchem/pkg-message
deleted file mode 100644
index f2d916105e46..000000000000
--- a/biology/xdrawchem/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-*** WARNING ***
-The sources for the xdrawchem package have not been
-thoroughly reviewed by the FreeBSD maintainer.
diff --git a/biology/xdrawchem/pkg-plist b/biology/xdrawchem/pkg-plist
index 4fd917c0e7d5..a677daf12969 100644
--- a/biology/xdrawchem/pkg-plist
+++ b/biology/xdrawchem/pkg-plist
@@ -1,121 +1,126 @@
 bin/xdrawchem
-share/xdrawchem/6ring_boat.cml
-share/xdrawchem/6ring_chair.cml
-share/xdrawchem/adenine.cml
-share/xdrawchem/alanine.cml
-share/xdrawchem/anthracene.cml
-share/xdrawchem/arginine.cml
-share/xdrawchem/asparagine.cml
-share/xdrawchem/aspartic_acid.cml
-share/xdrawchem/back.xpm
-share/xdrawchem/benzene.cml
-share/xdrawchem/benzene.png
-share/xdrawchem/biphenyl.cml
-share/xdrawchem/boc.cml
-share/xdrawchem/cyclobutane.cml
-share/xdrawchem/cycloheptane.cml
-share/xdrawchem/cyclohexane.cml
-share/xdrawchem/cyclohexane.png
-share/xdrawchem/cyclooctane.cml
-share/xdrawchem/cyclopentadiene-sp.cml
-share/xdrawchem/cyclopentadiene.cml
-share/xdrawchem/cyclopentane.cml
-share/xdrawchem/cyclopentane.png
-share/xdrawchem/cyclopropane.cml
-share/xdrawchem/cysteine.cml
-share/xdrawchem/cytosine.cml
-share/xdrawchem/d-fructose.cml
-share/xdrawchem/d-glucose.cml
-share/xdrawchem/dabcyl.cml
-share/xdrawchem/dabsyl.cml
-share/xdrawchem/dansyl.cml
-share/xdrawchem/deoxyribose.cml
-share/xdrawchem/doc/COPYRIGHT.txt
-share/xdrawchem/doc/GPL.txt
-share/xdrawchem/doc/HISTORY.txt
-share/xdrawchem/doc/arrowtool.png
-share/xdrawchem/doc/boldtool.png
-share/xdrawchem/doc/brackettool.png
-share/xdrawchem/doc/cinna.png
-share/xdrawchem/doc/color_pulldown.png
-share/xdrawchem/doc/copytool.png
-share/xdrawchem/doc/curvearrowtool.png
-share/xdrawchem/doc/cuttool.png
-share/xdrawchem/doc/dashtool.png
-share/xdrawchem/doc/downtool.png
-share/xdrawchem/doc/draw.html
-share/xdrawchem/doc/edit.html
-share/xdrawchem/doc/editmenu.html
-share/xdrawchem/doc/erasetool.png
-share/xdrawchem/doc/filemenu.html
-share/xdrawchem/doc/fileopen.png
-share/xdrawchem/doc/fileprint.png
-share/xdrawchem/doc/files.html
-share/xdrawchem/doc/filesave.png
-share/xdrawchem/doc/font_pulldown.png
-share/xdrawchem/doc/formatmenu.html
-share/xdrawchem/doc/functions.html
-share/xdrawchem/doc/groupmenu.html
-share/xdrawchem/doc/helpmenu.html
-share/xdrawchem/doc/index.html
-share/xdrawchem/doc/italictool.png
-share/xdrawchem/doc/linetool.png
-share/xdrawchem/doc/molinfo.html
-share/xdrawchem/doc/pastetool.png
-share/xdrawchem/doc/ringtool.png
-share/xdrawchem/doc/ringtoolbar.png
-share/xdrawchem/doc/selecttool.png
-share/xdrawchem/doc/spectra.html
-share/xdrawchem/doc/subscript.png
-share/xdrawchem/doc/superscript.png
-share/xdrawchem/doc/symboltool.png
-share/xdrawchem/doc/text.html
-share/xdrawchem/doc/texttool.png
-share/xdrawchem/doc/thick_pulldown.png
-share/xdrawchem/doc/toolbar.html
-share/xdrawchem/doc/toolmenu.html
-share/xdrawchem/doc/underlinetool.png
-share/xdrawchem/doc/uptool.png
-share/xdrawchem/edans.cml
-share/xdrawchem/fmoc.cml
-share/xdrawchem/forward.xpm
-share/xdrawchem/glutamic_acid.cml
-share/xdrawchem/glutamine.cml
-share/xdrawchem/glycine.cml
-share/xdrawchem/guanine.cml
-share/xdrawchem/histidine.cml
-share/xdrawchem/home.xpm
-share/xdrawchem/imidazole.cml
-share/xdrawchem/imidazole.png
-share/xdrawchem/indole.cml
-share/xdrawchem/isoleucine.cml
-share/xdrawchem/leucine.cml
-share/xdrawchem/lysine.cml
-share/xdrawchem/methionine.cml
-share/xdrawchem/naphthalene.cml
-share/xdrawchem/nitrophenylalanine.cml
-share/xdrawchem/phenylalanine.cml
-share/xdrawchem/proline.cml
-share/xdrawchem/purine.cml
-share/xdrawchem/pyrimidine.cml
-share/xdrawchem/ribose.cml
-share/xdrawchem/serine.cml
-share/xdrawchem/statine.cml
-share/xdrawchem/steroid.cml
-share/xdrawchem/threonine.cml
-share/xdrawchem/thymine.cml
-share/xdrawchem/tryptophan.cml
-share/xdrawchem/tyrosine.cml
-share/xdrawchem/uracil.cml
-share/xdrawchem/valine.cml
-share/xdrawchem/xdrawchem_da.qm
-share/xdrawchem/xdrawchem_de.qm
-share/xdrawchem/xdrawchem_en.qm
-share/xdrawchem/xdrawchem_es.qm
-share/xdrawchem/xdrawchem_fr.qm
-share/xdrawchem/xdrawchem_it.qm
-share/xdrawchem/xdrawchem_nl.qm
-share/xdrawchem/xdrawchem_pl.qm
-share/xdrawchem/xdrawchemrc
-@dirrm share/xdrawchem/doc
-@dirrm share/xdrawchem
+%%DATADIR%%/6ring_boat.cml
+%%DATADIR%%/6ring_chair.cml
+%%DATADIR%%/adenine.cml
+%%DATADIR%%/alanine.cml
+%%DATADIR%%/anthracene.cml
+%%DATADIR%%/arginine.cml
+%%DATADIR%%/asparagine.cml
+%%DATADIR%%/aspartic_acid.cml
+%%DATADIR%%/back.xpm
+%%DATADIR%%/benzene.cml
+%%DATADIR%%/benzene.png
+%%DATADIR%%/biotin.cml
+%%DATADIR%%/biphenyl.cml
+%%DATADIR%%/boc.cml
+%%DATADIR%%/caslist.txt
+%%DATADIR%%/cyclobutane.cml
+%%DATADIR%%/cycloheptane.cml
+%%DATADIR%%/cyclohexane.cml
+%%DATADIR%%/cyclohexane.png
+%%DATADIR%%/cyclooctane.cml
+%%DATADIR%%/cyclopentadiene-sp.cml
+%%DATADIR%%/cyclopentadiene.cml
+%%DATADIR%%/cyclopentane.cml
+%%DATADIR%%/cyclopentane.png
+%%DATADIR%%/cyclopropane.cml
+%%DATADIR%%/cysteine.cml
+%%DATADIR%%/cytosine.cml
+%%DATADIR%%/d-fructose.cml
+%%DATADIR%%/d-glucose.cml
+%%DATADIR%%/dabcyl.cml
+%%DATADIR%%/dabsyl.cml
+%%DATADIR%%/dansyl.cml
+%%DATADIR%%/deoxyribose.cml
+%%DATADIR%%/doc/COPYRIGHT.txt
+%%DATADIR%%/doc/GPL.txt
+%%DATADIR%%/doc/HISTORY.txt
+%%DATADIR%%/doc/arrowtool.png
+%%DATADIR%%/doc/boldtool.png
+%%DATADIR%%/doc/brackettool.png
+%%DATADIR%%/doc/cinna.png
+%%DATADIR%%/doc/color_pulldown.png
+%%DATADIR%%/doc/copytool.png
+%%DATADIR%%/doc/curvearrowtool.png
+%%DATADIR%%/doc/cuttool.png
+%%DATADIR%%/doc/dashtool.png
+%%DATADIR%%/doc/downtool.png
+%%DATADIR%%/doc/draw.html
+%%DATADIR%%/doc/edit.html
+%%DATADIR%%/doc/editmenu.html
+%%DATADIR%%/doc/erasetool.png
+%%DATADIR%%/doc/filemenu.html
+%%DATADIR%%/doc/fileopen.png
+%%DATADIR%%/doc/fileprint.png
+%%DATADIR%%/doc/files.html
+%%DATADIR%%/doc/filesave.png
+%%DATADIR%%/doc/font_pulldown.png
+%%DATADIR%%/doc/formatmenu.html
+%%DATADIR%%/doc/functions.html
+%%DATADIR%%/doc/groupmenu.html
+%%DATADIR%%/doc/helpmenu.html
+%%DATADIR%%/doc/index.html
+%%DATADIR%%/doc/italictool.png
+%%DATADIR%%/doc/linetool.png
+%%DATADIR%%/doc/molinfo.html
+%%DATADIR%%/doc/pastetool.png
+%%DATADIR%%/doc/ringtool.png
+%%DATADIR%%/doc/ringtoolbar.png
+%%DATADIR%%/doc/selecttool.png
+%%DATADIR%%/doc/spectra.html
+%%DATADIR%%/doc/subscript.png
+%%DATADIR%%/doc/superscript.png
+%%DATADIR%%/doc/symboltool.png
+%%DATADIR%%/doc/text.html
+%%DATADIR%%/doc/texttool.png
+%%DATADIR%%/doc/thick_pulldown.png
+%%DATADIR%%/doc/toolbar.html
+%%DATADIR%%/doc/toolmenu.html
+%%DATADIR%%/doc/underlinetool.png
+%%DATADIR%%/doc/uptool.png
+%%DATADIR%%/edans.cml
+%%DATADIR%%/fmoc.cml
+%%DATADIR%%/forward.xpm
+%%DATADIR%%/glutamic_acid.cml
+%%DATADIR%%/glutamine.cml
+%%DATADIR%%/glycine.cml
+%%DATADIR%%/guanine.cml
+%%DATADIR%%/histidine.cml
+%%DATADIR%%/home.xpm
+%%DATADIR%%/imidazole.cml
+%%DATADIR%%/imidazole.png
+%%DATADIR%%/indole.cml
+%%DATADIR%%/isoleucine.cml
+%%DATADIR%%/leucine.cml
+%%DATADIR%%/lysine.cml
+%%DATADIR%%/methionine.cml
+%%DATADIR%%/naphthalene.cml
+%%DATADIR%%/nitrophenylalanine.cml
+%%DATADIR%%/phenylalanine.cml
+%%DATADIR%%/proline.cml
+%%DATADIR%%/purine.cml
+%%DATADIR%%/pyrimidine.cml
+%%DATADIR%%/retro.txt
+%%DATADIR%%/ribose.cml
+%%DATADIR%%/serine.cml
+%%DATADIR%%/statine.cml
+%%DATADIR%%/steroid.cml
+%%DATADIR%%/threonine.cml
+%%DATADIR%%/thymine.cml
+%%DATADIR%%/tryptophan.cml
+%%DATADIR%%/tyrosine.cml
+%%DATADIR%%/uracil.cml
+%%DATADIR%%/valine.cml
+%%DATADIR%%/xdrawchem-icon.png
+%%DATADIR%%/xdrawchem_da.qm
+%%DATADIR%%/xdrawchem_de.qm
+%%DATADIR%%/xdrawchem_en.qm
+%%DATADIR%%/xdrawchem_es.qm
+%%DATADIR%%/xdrawchem_fr.qm
+%%DATADIR%%/xdrawchem_it.qm
+%%DATADIR%%/xdrawchem_nl.qm
+%%DATADIR%%/xdrawchem_pl.qm
+%%DATADIR%%/xdrawchem_ru.qm
+%%DATADIR%%/xdrawchemrc
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%