Use gamin instead of fam. Remove the -fam subpackage in the process

(libgamin has no external dependencies and it will simplify packaging
and dependencies).

ok landry@ jasper@
This commit is contained in:
ajacoutot 2009-12-04 08:08:31 +00:00
parent 1160c115d7
commit b8fec8bd7f
6 changed files with 12 additions and 20 deletions

View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.70 2009/12/01 16:13:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.71 2009/12/04 08:08:31 ajacoutot Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
COMMENT-fam= fam(3) gio module
VERSION= 2.22.3
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
PKGNAME-fam= glib2-fam-${VERSION}
CATEGORIES= devel
@ -31,24 +29,20 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs -fam
MULTI_PACKAGES= -main -docs
MODULES= devel/gettext
WANTLIB-main= c
WANTLIB-main= c m
LIB_DEPENDS-main= ${LIB_DEPENDS} \
pcre:pcre->=7.2:devel/pcre
pcre:pcre->=7.2:devel/pcre \
fam.>=1::sysutils/gamin,no_server,no_python
PKG_ARCH-docs= *
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
LIB_DEPENDS-fam= ${LIB_DEPENDS-main} \
gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::${BASE_PKGPATH},-main \
fam::sysutils/fam
WANTLIB-fam= m rpcsvc stdc++
# disable optimization on powerpc because it can lead to a
# segfault under some circumstances
.if ${MACHINE_ARCH} == "powerpc"

View File

@ -1 +0,0 @@
This package provides the fam(3) -File Alteration Monitor- gio module.

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared-fam,v 1.1 2008/11/22 18:56:13 ajacoutot Exp $
lib/gio/modules/libgiofam.so

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2008/04/09 13:10:18 jasper Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.3 2009/12/04 08:08:31 ajacoutot Exp $
lib/gio/modules/libgiofam.so
@lib lib/libgio-2.0.so.${LIBgio-2.0_VERSION}
@lib lib/libglib-2.0.so.${LIBglib-2.0_VERSION}
@lib lib/libgmodule-2.0.so.${LIBgmodule-2.0_VERSION}

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST-fam,v 1.1 2008/11/22 18:56:13 ajacoutot Exp $
%%SHARED%%
lib/gio/modules/libgiofam.a
lib/gio/modules/libgiofam.la

View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.8 2009/10/04 18:17:13 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2009/12/04 08:08:31 ajacoutot Exp $
@conflict glib2-fam-*
@pkgpath devel/glib2
@pkgpath devel/glib2,-fam
%%SHARED%%
@bin bin/glib-genmarshal
bin/glib-gettextize
@ -168,6 +170,8 @@ include/glib-2.0/gobject/gvaluetypes.h
@comment lib/charset.alias
lib/gio/
lib/gio/modules/
@comment lib/gio/modules/libgiofam.a
@comment lib/gio/modules/libgiofam.la
lib/glib-2.0/
lib/glib-2.0/include/
lib/glib-2.0/include/glibconfig.h