Break libgamin out from the gamin package, bump pkgrev

5 files changed, 52 insertions, 83 deletions

diff --git a/sysutils/gamin/DESCR b/sysutils/gamin/DESCR
index 72c26a99957..54f1952f709 100644
--- a/sysutils/gamin/DESCR
+++ b/sysutils/gamin/DESCR
@@ -9,3 +9,5 @@ The main goals of the project are:
       of FAM.
    3. Provide an API and ABI compatible replacement for FAM.
    4. Try to fix some other issues like resource consumption.
+
+This package provides the Gamin server.
diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile
index 89e0aa75b88..f0bb1ceca38 100644
--- a/sysutils/gamin/Makefile
+++ b/sysutils/gamin/Makefile
@@ -1,39 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2008/11/24 21:48:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/15 21:27:47 jmcneill Exp $
 
-DISTNAME=	gamin-0.1.10
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
+.include "../../sysutils/gamin/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnome.org/~veillard/gamin/
-COMMENT=	File alteration monitor
+PKGREVISION=		1
+CONFIGURE_ARGS+=	--enable-server
 
-CONFLICTS=	fam-[0-9]*
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-debug
-CONFIGURE_ARGS+=	--disable-gtk-doc
-CONFIGURE_ARGS+=	--without-threads
-CONFIGURE_ARGS+=	--with-html-dir=${DOCDIR:Q}
-CONFIGURE_ARGS+=	--without-python
-
-PKG_SYSCONFSUBDIR=	gamin
-DOCDIR=			${PREFIX}/share/doc/gamin
-
-SUBST_CLASSES+=		sysconfdir
-SUBST_MESSAGE.sysconfdir=fixing up sysconfdir
-SUBST_STAGE.sysconfdir=	pre-configure
-SUBST_FILES.sysconfdir=	doc/config.html doc/gamin.html server/gam_conf.c
-SUBST_SED.sysconfdir=	-e "s,/etc/gamin/,${PKG_SYSCONFDIR}/,"
+do-install:
+	${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_LIB} ${WRKSRC}/server/gam_server \
+		${DESTDIR}${PREFIX}/libexec
 
 .include "../../devel/glib2/buildlink3.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/doc; for file in *.html *.gif *.txt *.xml; do	\
-		${INSTALL_DATA} $$file ${DOCDIR}/$$file;		\
-	done
-
+.include "../../sysutils/libgamin/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gamin/Makefile.common b/sysutils/gamin/Makefile.common
new file mode 100644
index 00000000000..2c1958acc1c
--- /dev/null
+++ b/sysutils/gamin/Makefile.common
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile.common,v 1.1 2009/03/15 21:27:47 jmcneill Exp $
+#
+# used by sysutils/gamin/Makefile
+# used by sysutils/libgamin/Makefile
+
+DISTNAME=	gamin-0.1.10
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/~veillard/gamin/
+COMMENT=	File alteration monitor
+
+CONFLICTS=	fam-[0-9]*
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--disable-gtk-doc
+CONFIGURE_ARGS+=	--without-threads
+CONFIGURE_ARGS+=	--with-html-dir=${DOCDIR:Q}
+CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--disable-libgamin
+CONFIGURE_ARGS+=	--disable-server
+
+PKG_SYSCONFSUBDIR=	gamin
+DOCDIR=			${PREFIX}/share/doc/gamin
+
+SUBST_CLASSES+=		sysconfdir
+SUBST_MESSAGE.sysconfdir=fixing up sysconfdir
+SUBST_STAGE.sysconfdir=	pre-configure
+SUBST_FILES.sysconfdir=	doc/config.html doc/gamin.html server/gam_conf.c
+SUBST_SED.sysconfdir=	-e "s,/etc/gamin/,${PKG_SYSCONFDIR}/,"
+
+DISTINFO_FILE=	${.CURDIR}/../../sysutils/gamin/distinfo
+FILESDIR=	${.CURDIR}/../../sysutils/gamin/files
+PATCHES=	${.CURDIR}/../../sysutils/gamin/patches
diff --git a/sysutils/gamin/PLIST b/sysutils/gamin/PLIST
index 3cb3494da03..f1711e28c53 100644
--- a/sysutils/gamin/PLIST
+++ b/sysutils/gamin/PLIST
@@ -1,31 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/10 21:01:51 jlam Exp $
-include/fam.h
-lib/libfam.la
-lib/libgamin-1.la
-lib/libgamin_shared.a
-lib/pkgconfig/gamin.pc
+@comment $NetBSD: PLIST,v 1.2 2009/03/15 21:27:47 jmcneill Exp $
 libexec/gam_server
-share/doc/gamin/FAQ.html
-share/doc/gamin/callbacks.gif
-share/doc/gamin/client_server.gif
-share/doc/gamin/config.html
-share/doc/gamin/contacts.html
-share/doc/gamin/debug.html
-share/doc/gamin/debugging.txt
-share/doc/gamin/devel.html
-share/doc/gamin/differences.html
-share/doc/gamin/downloads.html
-share/doc/gamin/gamin-api.xml
-share/doc/gamin/gamin-refs.xml
-share/doc/gamin/gamin.html
-share/doc/gamin/index.html
-share/doc/gamin/internals.html
-share/doc/gamin/news.html
-share/doc/gamin/overview.html
-share/doc/gamin/python.html
-share/doc/gamin/security.html
-share/doc/gamin/server_structs.gif
-share/doc/gamin/socket.txt
-share/doc/gamin/using.html
-@dirrm share/doc/gamin
-@unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE}
diff --git a/sysutils/gamin/buildlink3.mk b/sysutils/gamin/buildlink3.mk
deleted file mode 100644
index e0b9f6458c2..00000000000
--- a/sysutils/gamin/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2007/08/05 20:03:35 tnn Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GAMIN_BUILDLINK3_MK:=	${GAMIN_BUILDLINK3_MK}+
-
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	gamin
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngamin}
-BUILDLINK_PACKAGES+=	gamin
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gamin
-
-.if ${GAMIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.gamin+=	gamin>=0.1.5
-BUILDLINK_ABI_DEPENDS.gamin+=	gamin>=0.1.9
-BUILDLINK_PKGSRCDIR.gamin?=	../../sysutils/gamin
-.endif	# GAMIN_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}