- integrate COMMENT

- enable thread support by default using Pth

devel/glib/Makefile

@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.36 2001/03/22 14:52:08 brad Exp $
+# $OpenBSD: Makefile,v 1.37 2001/04/03 14:12:47 brad Exp $
 
-.if ${MACHINE_ARCH} == "powerpc"
-BROKEN=		"BROKEN on powerpc: reason unknown at the moment"
-.endif
+COMMENT=	"useful routines for C programming"
 
 DISTNAME=	glib-1.2.9
 CATEGORIES=	devel
-NEED_VERSION=	1.336
+NEED_VERSION=	1.384
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
 		http://www.ameth.org/gimp/gtk/v1.2/
 
 HOMEPAGE=	http://www.gtk.org/
 
+LIB_DEPENDS=	pthread.14::devel/pth
+
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -24,20 +24,15 @@ SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
-
-FLAVORS=	threads
-FLAVOR?=
-
-.if ${FLAVOR:L} == "threads"
-. if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "powerpc"
-BROKEN=		"pthreads are currently not working on the ${MACHINE_ARCH} architecture"
-. endif
-CONFIGURE_ARGS+= --enable-threads
-.else
-CONFIGURE_ARGS+= --disable-threads
-.endif
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/pth" \
+		LDFLAGS="-L${LOCALBASE}/lib/pth"
 
 post-extract:
 	@rm -f ${WRKSRC}/docs/glib.info*
 
+post-patch:
+	@mv -f ${WRKSRC}/glib-config.in ${WRKSRC}/glib-config.in.orig
+	@sed -e s#!!PTHREAD_LIBDIR!!#${LOCALBASE}/lib/pth#g \
+		${WRKSRC}/glib-config.in.orig > ${WRKSRC}/glib-config.in
+
 .include <bsd.port.mk>

devel/glib/patches/patch-glib-config_in

@@ -1,5 +1,5 @@
 --- glib-config.in.orig	Sat Oct 28 00:35:30 2000
-+++ glib-config.in	Wed Mar  7 08:46:18 2001
++++ glib-config.in	Mon Mar 26 20:36:35 2001
 @@ -88,7 +88,7 @@
  	if test "$lib_gthread" = "yes"; then
  		cflags="$cflags @G_THREAD_CFLAGS@"
@@ -9,3 +9,12 @@
  fi
  if test "$echo_libs" = "yes"; then
  	libsp=""
+@@ -98,7 +98,7 @@
+ 	fi
+ 	if test "$lib_gthread" = "yes"; then
+ 		libsp="-lgthread $libsp"
+-		libsa="$libsa @G_THREAD_LIBS@"
++		libsa="$libsa -L!!PTHREAD_LIBDIR!! @G_THREAD_LIBS@"
+ 	fi
+ 	if test "$lib_gmodule" = "yes"; then
+ 		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"

devel/glib/pkg/COMMENT

@@ -1 +0,0 @@
-useful routines for C programming