- use gcc4 (allows building with openbabel-2.2.0)

- regen PLIST

x11/xdrawchem/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2008/01/03 09:15:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2008/08/20 16:09:23 ajacoutot Exp $
 
 COMMENT=	two-dimensional molecule drawing program
 
 DISTNAME=	xdrawchem-1.9.9
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11 biology
 
 HOMEPAGE=	http://xdrawchem.sourceforge.net/
@@ -17,21 +18,30 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdrawchem/}
 
-WANTLIB=	c m pthread stdc++ z
+WANTLIB=	c m pthread z
 
 MODULES=	x11/qt3
 
-LIB_DEPENDS=	openbabel.>=3::misc/openbabel
+BUILD_DEPENDS=	:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION}
+LIB_DEPENDS=	openbabel.>=4:openbabel->=2.2.0:misc/openbabel
+
+AUTOCONF_VERSION=2.60
 
 VMEM_WARNING=	Yes
 
 USE_X11=	Yes
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
+
+# XXX follows openbabel GCC to avoid mismatching symbols
+MODULES+=	gcc4
+MODGCC4_LANGS=	c++
+MODGCC4_ARCHES=	*
+
+MAKE_FLAGS=	LDFLAGS+="-lqt-mt -pthread -L${X11BASE}/lib"
+MAKE_ENV=	AUTOCONF_VERSION=${AUTOCONF_VERSION}
+
 CONFIGURE_STYLE=gnu
-
-MAKE_FLAGS+=	LDFLAGS+="-lqt-mt -pthread -L${X11BASE}/lib"
-
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-qtincdir=${MODQT_INCDIR} \
 		--with-qtlibdir=${MODQT_LIBDIR}

x11/xdrawchem/pkg/PLIST

@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/23 15:43:05 ajacoutot Exp $
-bin/xdrawchem
+@comment $OpenBSD: PLIST,v 1.2 2008/08/20 16:09:23 ajacoutot Exp $
+@bin bin/xdrawchem
 share/xdrawchem/
 share/xdrawchem/6ring_boat.cml
 share/xdrawchem/6ring_chair.cml