pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs2 Disable the cdda support from gnom...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fe4e85986d87
branches: trunk
changeset: 473046:fe4e85986d87
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Thu Apr 15 16:36:20 2004 +0000
description:
Disable the cdda support from gnome-vfs2, to trim the dependencies a bit.
Bump PKGREVISION to 1 because of this.
While doing this, split the Makefile in two parts to aid with the addition
of packages providing modules (which are distributed inside the gnome-vfs2
distfile).
Also do some PRINT_PLIST_AWK tricks.
diffstat:
sysutils/gnome-vfs2/Makefile | 75 +++++++++---------------------
sysutils/gnome-vfs2/Makefile.common | 89 +++++++++++++++++++++++++++++++++++++
sysutils/gnome-vfs2/PLIST | 6 +--
sysutils/gnome-vfs2/buildlink3.mk | 3 +-
4 files changed, 115 insertions(+), 58 deletions(-)
diffs (241 lines):
diff -r 7b9fcd841db5 -r fe4e85986d87 sysutils/gnome-vfs2/Makefile
--- a/sysutils/gnome-vfs2/Makefile Thu Apr 15 16:29:16 2004 +0000
+++ b/sysutils/gnome-vfs2/Makefile Thu Apr 15 16:36:20 2004 +0000
@@ -1,76 +1,49 @@
-# $NetBSD: Makefile,v 1.34 2004/04/01 18:21:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2004/04/15 16:36:20 jmmv Exp $
#
-DISTNAME= gnome-vfs-2.6.0
-PKGNAME= ${DISTNAME:S/vfs/vfs2/}
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.6/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jmmv%NetBSD.org@localhost
-HOMEPAGE= http://www.gnome.org/
-COMMENT= GNOME Virtual File System (v2)
+PKGREVISION= 1
-BUILD_USES_MSGFMT= YES
DEPENDS+= shared-mime-info>=0.13:../../databases/shared-mime-info
-GNU_CONFIGURE= YES
-USE_BUILDLINK3= YES
-USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
-USE_LIBTOOL= YES
-USE_PKGINSTALL= YES
-
PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
-CONFIGURE_ARGS= --disable-gtk
-CONFIGURE_ARGS+= --disable-samba
-CONFIGURE_ARGS+= --enable-platform-gnome-2
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
-CONFIGURE_ENV+= openssl_libs="yes"
-
-CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
-CPPFLAGS+= -DPREFIX=\"\\\"${PREFIX}\\\"\"
-CPPFLAGS+= -DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\"
-
-PKG_SYSCONFSUBDIR= gnome-vfs-2.0
OWN_DIRS= ${PKG_SYSCONFDIR}/modules ${PKG_SYSCONFDIR}/vfolders
-EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
-EGFILES= modules/cdda-module.conf
-EGFILES+= modules/default-modules.conf
-EGFILES+= modules/ssl-modules.conf
-EGFILES+= vfolders/applications-all-users.vfolder-info
-EGFILES+= vfolders/favorites.vfolder-info
-EGFILES+= vfolders/network.vfolder-info
-EGFILES+= vfolders/preferences-all-users.vfolder-info
-EGFILES+= vfolders/server-settings.vfolder-info
-EGFILES+= vfolders/start-here.vfolder-info
-EGFILES+= vfolders/system-settings.vfolder-info
-.for f in ${EGFILES}
-CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
-.endfor
-.undef f
+EGFILES+= modules/default-modules.conf
+EGFILES+= modules/ssl-modules.conf
+EGFILES+= vfolders/applications-all-users.vfolder-info
+EGFILES+= vfolders/favorites.vfolder-info
+EGFILES+= vfolders/network.vfolder-info
+EGFILES+= vfolders/preferences-all-users.vfolder-info
+EGFILES+= vfolders/server-settings.vfolder-info
+EGFILES+= vfolders/start-here.vfolder-info
+EGFILES+= vfolders/system-settings.vfolder-info
GCONF2_SCHEMAS= desktop_default_applications.schemas
GCONF2_SCHEMAS+= desktop_gnome_url_handlers.schemas
GCONF2_SCHEMAS+= system_http_proxy.schemas
GCONF2_SCHEMAS+= system_smb.schemas
+# lib/vfs is shared with gnome-vfs.
+PRINT_PLIST_AWK+= /^@dirrm lib\/vfs$$/ \
+ { print "@unexec $${RMDIR} %D/" $$2 \
+ " 2>/dev/null || $${TRUE}"; next; }
+
+.include "Makefile.common"
+
+.include "../../devel/GConf2/schemas.mk"
+.include "../../sysutils/fam/buildlink3.mk"
+
.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/cdparanoia/buildlink3.mk"
.include "../../databases/gnome-mime-data/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../sysutils/fam/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r 7b9fcd841db5 -r fe4e85986d87 sysutils/gnome-vfs2/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-vfs2/Makefile.common Thu Apr 15 16:36:20 2004 +0000
@@ -0,0 +1,89 @@
+# $NetBSD: Makefile.common,v 1.1 2004/04/15 16:36:20 jmmv Exp $
+#
+
+DISTNAME= gnome-vfs-2.6.0
+PKGNAME= ${DISTNAME:S/vfs/vfs2/}
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.6/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= jmmv%NetBSD.org@localhost
+HOMEPAGE= http://www.gnome.org/
+COMMENT= GNOME Virtual File System (v2)
+
+BUILD_USES_MSGFMT= YES
+
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs2/distinfo
+PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs2/patches
+
+GNU_CONFIGURE= YES
+USE_BUILDLINK3= YES
+USE_PKGLOCALEDIR= YES
+USE_GNU_TOOLS+= make
+USE_LIBTOOL= YES
+USE_PKGINSTALL= YES
+
+CONFIGURE_ARGS+= --disable-fam
+CONFIGURE_ARGS+= --disable-gtk
+CONFIGURE_ARGS+= --disable-samba
+CONFIGURE_ARGS+= --enable-platform-gnome-2
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ENV+= openssl_libs=yes
+
+CPPFLAGS+= -DPREFIX=\"\\\"${PREFIX}\\\"\"
+CPPFLAGS+= -DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\"
+
+PKG_SYSCONFSUBDIR= gnome-vfs-2.0
+
+EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
+.for f in ${EGFILES}
+CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
+#
+# The following stuff is to allow easy building of modules distributed within
+# gnome-vfs2 as independent packages.
+#
+# GNOME_VFS2_NAME - Name of the module beeing built. Will be added to the
+# package name, and also used as the library name.
+# GNOME_VFS2_FLAG - Base name of the flag passed to configure to enable the
+# module.
+#
+.if defined(GNOME_VFS2_NAME) && !empty(GNOME_VFS2_NAME)
+GNOME_VFS2_FLAG?= ${GNOME_VFS2_NAME}
+
+PKGNAME:= ${PKGNAME:S/gnome-vfs2/gnome-vfs2-${GNOME_VFS2_NAME}/}
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS2_FLAG}/--enable-${GNOME_VFS2_FLAG}/}
+COMMENT+= - ${GNOME_VFS2_NAME} plugin
+
+ALL_TARGET= lib${GNOME_VFS2_NAME}.la
+BUILD_DIRS= ${WRKSRC}/modules
+
+# Fix paths to already installed libraries (by the gnome-vfs2 package).
+SUBST_CLASSES+= libs
+SUBST_MESSAGE.libs= "Fixing path to dependent libraries."
+SUBST_STAGE.libs= pre-configure
+SUBST_FILES.libs= modules/Makefile.in
+SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
+
+BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.6.0nb1
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+
+PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
+ { print "@comment in gnome-vfs2: " $$0; next; }
+PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; }
+PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \
+ { print "@comment in gnome-vfs2: " $$0; next; }
+
+do-install:
+ cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \
+ ${INSTALL_DATA} lib${GNOME_VFS2_NAME}.la \
+ ${PREFIX}/lib/gnome-vfs-2.0/modules
+ cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \
+ ${PREFIX}/lib/gnome-vfs-2.0/modules
+.endif
+
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
diff -r 7b9fcd841db5 -r fe4e85986d87 sysutils/gnome-vfs2/PLIST
--- a/sysutils/gnome-vfs2/PLIST Thu Apr 15 16:29:16 2004 +0000
+++ b/sysutils/gnome-vfs2/PLIST Thu Apr 15 16:36:20 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/04/01 18:21:20 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/04/15 16:36:20 jmmv Exp $
bin/gnomevfs-cat
bin/gnomevfs-copy
bin/gnomevfs-info
@@ -54,9 +54,6 @@
lib/gnome-vfs-2.0/modules/libbzip2.a
lib/gnome-vfs-2.0/modules/libbzip2.la
lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libcdda.a
-lib/gnome-vfs-2.0/modules/libcdda.la
-lib/gnome-vfs-2.0/modules/libcdda.so
lib/gnome-vfs-2.0/modules/libcomputer.a
lib/gnome-vfs-2.0/modules/libcomputer.la
lib/gnome-vfs-2.0/modules/libcomputer.so
@@ -179,7 +176,6 @@
share/doc/html/gnome-vfs-2.0/modules.html
share/doc/html/gnome-vfs-2.0/right.png
share/doc/html/gnome-vfs-2.0/up.png
-share/examples/gnome-vfs-2.0/modules/cdda-module.conf
share/examples/gnome-vfs-2.0/modules/default-modules.conf
share/examples/gnome-vfs-2.0/modules/ssl-modules.conf
share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
diff -r 7b9fcd841db5 -r fe4e85986d87 sysutils/gnome-vfs2/buildlink3.mk
--- a/sysutils/gnome-vfs2/buildlink3.mk Thu Apr 15 16:29:16 2004 +0000
+++ b/sysutils/gnome-vfs2/buildlink3.mk Thu Apr 15 16:36:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:21:20 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/04/15 16:36:20 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+
@@ -16,7 +16,6 @@
.endif # GNOME_VFS2_BUILDLINK3_MK
.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../audio/cdparanoia/buildlink3.mk"
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index