Tue Apr 20 17:43:51 2010 UTC ()
Drop fam support from devel/glib2; I'll readd this as sysutils/gio-fam.
This functionality can easily be built as a loadable module, so it should
not be conditional on a build-time option.

Split the Makefile into two parts so that the sysutils/gio-fam package can
reuse most of it.

Bump PKGREVISION to 1.


(jmmv)
diff -r1.172 -r1.173 pkgsrc/devel/glib2/Makefile
diff -r0 -r1.1 pkgsrc/devel/glib2/Makefile.common
diff -r1.51 -r1.52 pkgsrc/devel/glib2/PLIST
diff -r1.131 -r1.132 pkgsrc/devel/glib2/distinfo
diff -r1.6 -r0 pkgsrc/devel/glib2/options.mk
diff -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-cd

cvs diff -r1.172 -r1.173 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2010/03/16 13:41:15 1.172
+++ pkgsrc/devel/glib2/Makefile 2010/04/20 17:43:50 1.173
@@ -1,100 +1,32 @@ @@ -1,100 +1,32 @@
1# $NetBSD: Makefile,v 1.172 2010/03/16 13:41:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.173 2010/04/20 17:43:50 jmmv Exp $
2 2
3# When updating glib2, please apply patch-ak to configure.in 3.include "Makefile.common"
4# Then run a matching version of autoconf to regen patch-aa. 4
5DISTNAME= glib-2.22.5 5PKGREVISION= 1
6PKGNAME= ${DISTNAME:S/glib/glib2/} 
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.22/ \ 
9 ${MASTER_SITE_GNOME:=sources/glib/2.22/} 
10EXTRACT_SUFX= .tar.bz2 
11 7
12MAINTAINER= pkgsrc-users@NetBSD.org 
13HOMEPAGE= http://developer.gnome.org/doc/API/2.0/glib/glib.html 
14COMMENT= Some useful routines for C programming (glib2) 8COMMENT= Some useful routines for C programming (glib2)
15LICENSE= gnu-lgpl-v2 
16 
17PKG_INSTALLATION_TYPES= overwrite pkgviews 
18PKG_DESTDIR_SUPPORT= user-destdir 
19 9
20USE_PKGLOCALEDIR= yes 10USE_TOOLS+= msgfmt perl:run
21USE_TOOLS+= gmake msgfmt perl:run pkg-config 
22USE_LANGUAGES= c c++ c99 
23USE_LIBTOOL= yes 
24TEST_TARGET= check 
25 11
26PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in 12PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in
27PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 13PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
28PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in 14PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in
29PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 15PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
30PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 16PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
31PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in 17PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in
32PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 18PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
33PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in 19PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in
34PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 20PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
35PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in 21PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in
36PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 22PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
37PKGCONFIG_OVERRIDE+= gio-2.0.pc.in 23PKGCONFIG_OVERRIDE+= gio-2.0.pc.in
38PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in 24PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in
39 25
40GNU_CONFIGURE= yes 26# need pcre utf8 + unicode-properties
41CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 27BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
42CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib 
43CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} 
44CONFIGURE_ARGS.gnu-iconv+= --with-libiconv=gnu 
45CONFIGURE_ARGS+= --with-pcre=system 
46 
47CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} 
48 
49.include "../../mk/bsd.prefs.mk" 
50 
51.if ${OPSYS} == "NetBSD" 
52# configure detects wrongly 
53CONFIGURE_ENV+= ac_cv_func_statfs=no 
54.endif 
55 
56CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 
57CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\"" 
58CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 
59 
60.if ${OPSYS} == "FreeBSD" 
61SUBST_CLASSES+= thr 
62SUBST_STAGE.thr= post-patch 
63SUBST_FILES.thr= gthread/Makefile.in 
64. if ${OS_VERSION:R} >= 5 
65SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g" 
66. else 
67SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g" 
68. endif 
69SUBST_MESSAGE.thr= Fixing libgthread. 
70 
71.endif 
72 
73.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*) 
74CONFIGURE_ENV+= gt_cv_c_wchar_t=no 
75.endif 
76 
77.if ${OPSYS} == "HPUX" 
78CONFIGURE_ENV+= ac_cv_func_mmap_fixed_mapped=yes 
79.endif 
80 
81PLIST_VARS+= fam 
82 
83.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1" 
84.include "options.mk" 
85.endif 
86 28
87.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
88.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
89.include "../../mk/dlopen.buildlink3.mk" 
90 
91.if !empty(MACHINE_PLATFORM:MIRIX-5*) 
92CONFIGURE_ARGS+= --disable-threads 
93.else 
94.include "../../mk/pthread.buildlink3.mk" 
95.endif 
96# need pcre utf8 + unicode-properties 
97BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1 
98.include "../../devel/pcre/buildlink3.mk" 31.include "../../devel/pcre/buildlink3.mk"
99 
100.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/devel/glib2/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2010/04/20 17:43:50 jmmv Exp $
#
# used by devel/glib2/Makefile
# used by sysutils/gio-fam/Makefile

# When updating this package, please apply patch-ak to configure.in and
# then run a matching version of autoconf to regen patch-aa.
DISTNAME=		glib-2.22.5
PKGNAME=		${DISTNAME:S/glib/glib2/}
CATEGORIES=		# empty; redefined in Makefile
MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.22/ \
			${MASTER_SITE_GNOME:=sources/glib/2.22/}
EXTRACT_SUFX=		.tar.bz2

MAINTAINER=		pkgsrc-users@NetBSD.org
HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
COMMENT=		# empty; redefined in Makefile
LICENSE=		gnu-lgpl-v2

PKG_INSTALLATION_TYPES=	overwrite pkgviews
PKG_DESTDIR_SUPPORT=	user-destdir

USE_PKGLOCALEDIR=	yes
USE_TOOLS+=		gmake pkg-config
USE_LANGUAGES=		c c++ c99
USE_LIBTOOL=		yes
TEST_TARGET=		check

DISTINFO_FILE=		${.CURDIR}/../../devel/glib2/distinfo
PATCHDIR=		${.CURDIR}/../../devel/glib2/patches

GNU_CONFIGURE=		yes
CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
CONFIGURE_ARGS+=	--disable-fam	# See sysutils/gio-fam.
CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
CONFIGURE_ARGS+=	--with-pcre=system

CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu

CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}

.include "../../mk/bsd.prefs.mk"

.if ${OPSYS} == "NetBSD"
# configure detects wrongly
CONFIGURE_ENV+=		ac_cv_func_statfs=no
.endif

CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""

.if ${OPSYS} == "FreeBSD"
SUBST_CLASSES+=		thr
SUBST_STAGE.thr=	post-patch
SUBST_FILES.thr=	gthread/Makefile.in
.  if ${OS_VERSION:R} >= 5
SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
.  else
SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
.  endif
SUBST_MESSAGE.thr=	Fixing libgthread.

.endif

.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
.endif

.if ${OPSYS} == "HPUX"
CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
.endif

.include "../../mk/dlopen.buildlink3.mk"

.if !empty(MACHINE_PLATFORM:MIRIX-5*)
CONFIGURE_ARGS+=	--disable-threads
.else
.include "../../mk/pthread.buildlink3.mk"
.endif

cvs diff -r1.51 -r1.52 pkgsrc/devel/glib2/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/glib2/PLIST 2010/03/16 13:41:15 1.51
+++ pkgsrc/devel/glib2/PLIST 2010/04/20 17:43:50 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.51 2010/03/16 13:41:15 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.52 2010/04/20 17:43:50 jmmv Exp $
2bin/glib-genmarshal 2bin/glib-genmarshal
3bin/glib-gettextize 3bin/glib-gettextize
4bin/glib-mkenums 4bin/glib-mkenums
5bin/gobject-query 5bin/gobject-query
6bin/gtester 6bin/gtester
7bin/gtester-report 7bin/gtester-report
8include/glib/gio-unix-2.0/gio/gdesktopappinfo.h 8include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
9include/glib/gio-unix-2.0/gio/gunixconnection.h 9include/glib/gio-unix-2.0/gio/gunixconnection.h
10include/glib/gio-unix-2.0/gio/gunixfdmessage.h 10include/glib/gio-unix-2.0/gio/gunixfdmessage.h
11include/glib/gio-unix-2.0/gio/gunixinputstream.h 11include/glib/gio-unix-2.0/gio/gunixinputstream.h
12include/glib/gio-unix-2.0/gio/gunixmounts.h 12include/glib/gio-unix-2.0/gio/gunixmounts.h
13include/glib/gio-unix-2.0/gio/gunixoutputstream.h 13include/glib/gio-unix-2.0/gio/gunixoutputstream.h
14include/glib/gio-unix-2.0/gio/gunixsocketaddress.h 14include/glib/gio-unix-2.0/gio/gunixsocketaddress.h
@@ -148,27 +148,26 @@ include/glib/glib-2.0/gobject/gmarshal.h @@ -148,27 +148,26 @@ include/glib/glib-2.0/gobject/gmarshal.h
148include/glib/glib-2.0/gobject/gobject.h 148include/glib/glib-2.0/gobject/gobject.h
149include/glib/glib-2.0/gobject/gobjectnotifyqueue.c 149include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
150include/glib/glib-2.0/gobject/gparam.h 150include/glib/glib-2.0/gobject/gparam.h
151include/glib/glib-2.0/gobject/gparamspecs.h 151include/glib/glib-2.0/gobject/gparamspecs.h
152include/glib/glib-2.0/gobject/gsignal.h 152include/glib/glib-2.0/gobject/gsignal.h
153include/glib/glib-2.0/gobject/gsourceclosure.h 153include/glib/glib-2.0/gobject/gsourceclosure.h
154include/glib/glib-2.0/gobject/gtype.h 154include/glib/glib-2.0/gobject/gtype.h
155include/glib/glib-2.0/gobject/gtypemodule.h 155include/glib/glib-2.0/gobject/gtypemodule.h
156include/glib/glib-2.0/gobject/gtypeplugin.h 156include/glib/glib-2.0/gobject/gtypeplugin.h
157include/glib/glib-2.0/gobject/gvalue.h 157include/glib/glib-2.0/gobject/gvalue.h
158include/glib/glib-2.0/gobject/gvaluearray.h 158include/glib/glib-2.0/gobject/gvaluearray.h
159include/glib/glib-2.0/gobject/gvaluecollector.h 159include/glib/glib-2.0/gobject/gvaluecollector.h
160include/glib/glib-2.0/gobject/gvaluetypes.h 160include/glib/glib-2.0/gobject/gvaluetypes.h
161${PLIST.fam}lib/gio/modules/libgiofam.la 
162lib/glib-2.0/include/glibconfig.h 161lib/glib-2.0/include/glibconfig.h
163lib/libgio-2.0.la 162lib/libgio-2.0.la
164lib/libglib-2.0.la 163lib/libglib-2.0.la
165lib/libgmodule-2.0.la 164lib/libgmodule-2.0.la
166lib/libgobject-2.0.la 165lib/libgobject-2.0.la
167lib/libgthread-2.0.la 166lib/libgthread-2.0.la
168lib/pkgconfig/gio-2.0.pc 167lib/pkgconfig/gio-2.0.pc
169lib/pkgconfig/gio-unix-2.0.pc 168lib/pkgconfig/gio-unix-2.0.pc
170lib/pkgconfig/glib-2.0.pc 169lib/pkgconfig/glib-2.0.pc
171lib/pkgconfig/gmodule-2.0.pc 170lib/pkgconfig/gmodule-2.0.pc
172lib/pkgconfig/gmodule-export-2.0.pc 171lib/pkgconfig/gmodule-export-2.0.pc
173lib/pkgconfig/gmodule-no-export-2.0.pc 172lib/pkgconfig/gmodule-no-export-2.0.pc
174lib/pkgconfig/gobject-2.0.pc 173lib/pkgconfig/gobject-2.0.pc

cvs diff -r1.131 -r1.132 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2010/03/16 13:41:15 1.131
+++ pkgsrc/devel/glib2/distinfo 2010/04/20 17:43:51 1.132
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.131 2010/03/16 13:41:15 wiz Exp $ 1$NetBSD: distinfo,v 1.132 2010/04/20 17:43:51 jmmv Exp $
2 2
3SHA1 (glib-2.22.5.tar.bz2) = a35acb06c3155937651aaffc1f1895c6e19a91a4 3SHA1 (glib-2.22.5.tar.bz2) = a35acb06c3155937651aaffc1f1895c6e19a91a4
4RMD160 (glib-2.22.5.tar.bz2) = 2e2f06f956f63a75121b335e4150edc44f5e04f2 4RMD160 (glib-2.22.5.tar.bz2) = 2e2f06f956f63a75121b335e4150edc44f5e04f2
5Size (glib-2.22.5.tar.bz2) = 4988402 bytes 5Size (glib-2.22.5.tar.bz2) = 4988402 bytes
6SHA1 (patch-aa) = c88b260236d4cfdf4b621ed29bc6292456b3e38d 6SHA1 (patch-aa) = c88b260236d4cfdf4b621ed29bc6292456b3e38d
7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 7SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 8SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
11SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c 11SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
12SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b 12SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e 13SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
14SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f 14SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
15SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c 15SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
16SHA1 (patch-ak) = 04e3d1eb9648186776dee81d2db9507c0df0c62e 16SHA1 (patch-ak) = 04e3d1eb9648186776dee81d2db9507c0df0c62e
17SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e 17SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
18SHA1 (patch-an) = e4a4b88a029c534f5be552eb301607ac57961915 18SHA1 (patch-an) = e4a4b88a029c534f5be552eb301607ac57961915
19SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95 19SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
20SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff 20SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
21SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 21SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
 22SHA1 (patch-cd) = 1548985fcaca76fc42bed651eda2ea658eb84fd7

File Deleted: pkgsrc/devel/glib2/options.mk

File Added: pkgsrc/devel/glib2/patches/Attic/patch-cd
$NetBSD: patch-cd,v 1.1 2010/04/20 17:43:51 jmmv Exp $

sysutils/glib2-fam builds the gio/fam backend as a separate module.  Force it
to link against the installed version of glib2, as it is not rebuilt by the
package.

--- gio/fam/Makefile.in.orig	2010-03-16 02:52:15.000000000 +0000
+++ gio/fam/Makefile.in
@@ -76,10 +76,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(giomoduledir)"
 LTLIBRARIES = $(giomodule_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
-	$(top_builddir)/gobject/libgobject-2.0.la \
-	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
 	libgiofam_la-fam-module.lo \
@@ -311,7 +308,7 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-localedir = @localedir@
+localedir = /usr/pkg/share/locale
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
@@ -369,9 +366,7 @@ libgiofam_la_CFLAGS = \
 
 libgiofam_la_LDFLAGS = $(module_flags)
 libgiofam_la_LIBADD = \
-		$(top_builddir)/gio/libgio-2.0.la \
-		$(top_builddir)/gobject/libgobject-2.0.la \
-		$(top_builddir)/glib/libglib-2.0.la \
+		$$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
 		$(GLIB_LIBS) \
 		$(FAM_LIBS) \
 		$(NULL)