Wed Jun 10 14:49:44 2009 UTC ()
Remove obsolete configure args.


(wiz)
diff -r1.17 -r1.18 pkgsrc/sysutils/gnome-vfs/Makefile.common
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/gnome-vfs/Makefile.common (switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile.common 2009/03/19 11:32:45 1.17
+++ pkgsrc/sysutils/gnome-vfs/Makefile.common 2009/06/10 14:49:44 1.18
@@ -1,114 +1,112 @@ @@ -1,114 +1,112 @@
1# $NetBSD: Makefile.common,v 1.17 2009/03/19 11:32:45 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.18 2009/06/10 14:49:44 wiz Exp $
2# 2#
3# used by audio/gnome-vfs-cdda/Makefile 3# used by audio/gnome-vfs-cdda/Makefile
4# used by net/gnome-vfs-dns-sd/Makefile 4# used by net/gnome-vfs-dns-sd/Makefile
5# used by net/gnome-vfs-smb/Makefile 5# used by net/gnome-vfs-smb/Makefile
6 6
7GNOME_VFS_VERSION= 2.24.1 7GNOME_VFS_VERSION= 2.24.1
8 8
9DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} 9DISTNAME= gnome-vfs-${GNOME_VFS_VERSION}
10CATEGORIES?= sysutils 10CATEGORIES?= sysutils
11CATEGORIES+= gnome 11CATEGORIES+= gnome
12MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.24/} 12MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.24/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.gnome.org/ 16HOMEPAGE= http://www.gnome.org/
17COMMENT= GNOME Virtual File System (v2) 17COMMENT= GNOME Virtual File System (v2)
18 18
19DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo 19DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo
20PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches 20PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches
21 21
22GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
23USE_PKGLOCALEDIR= YES 23USE_PKGLOCALEDIR= YES
24USE_TOOLS+= gmake intltool msgfmt pkg-config 24USE_TOOLS+= gmake intltool msgfmt pkg-config
25USE_LIBTOOL= YES 25USE_LIBTOOL= YES
26 26
27CONFIGURE_ARGS+= --disable-cdda 27CONFIGURE_ARGS+= --disable-cdda
28CONFIGURE_ARGS+= --disable-gtk 
29CONFIGURE_ARGS+= --disable-howl 28CONFIGURE_ARGS+= --disable-howl
30CONFIGURE_ARGS+= --disable-openssl 29CONFIGURE_ARGS+= --disable-openssl
31CONFIGURE_ARGS+= --disable-samba 30CONFIGURE_ARGS+= --disable-samba
32CONFIGURE_ARGS+= --enable-gnutls 31CONFIGURE_ARGS+= --enable-gnutls
33CONFIGURE_ARGS+= --enable-platform-gnome-2 
34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
35 33
36CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 34CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
37CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 35CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
38MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale 36MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
39 37
40INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 38INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
41INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules 39INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules
42 40
43PKG_SYSCONFSUBDIR= gnome-vfs-2.0 41PKG_SYSCONFSUBDIR= gnome-vfs-2.0
44 42
45EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 43EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
46.for f in ${EGFILES} 44.for f in ${EGFILES}
47CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 45CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
48.endfor 46.endfor
49 47
50.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
51 49
52# XXX Work-around for a problem in the configure script which checks for 50# XXX Work-around for a problem in the configure script which checks for
53# statvfs(2) having SVR4 in mind. Solving this in the script itself could 51# statvfs(2) having SVR4 in mind. Solving this in the script itself could
54# be the right way to go, but it is out of the scope of a local patch; it 52# be the right way to go, but it is out of the scope of a local patch; it
55# could require changing the code a lot, which is already very... complex. 53# could require changing the code a lot, which is already very... complex.
56.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h) 54.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h)
57post-wrapper: 55post-wrapper:
58 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys 56 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys
59 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h 57 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h
60.endif 58.endif
61 59
62# 60#
63# The following stuff is to allow easy building of modules distributed within 61# The following stuff is to allow easy building of modules distributed within
64# gnome-vfs as independent packages. 62# gnome-vfs as independent packages.
65# 63#
66# GNOME_VFS_NAME - Name of the module beeing built. Will be added to the 64# GNOME_VFS_NAME - Name of the module beeing built. Will be added to the
67# package name, and also used as the library name. 65# package name, and also used as the library name.
68# GNOME_VFS_FLAG - Base name of the flag passed to configure to enable the 66# GNOME_VFS_FLAG - Base name of the flag passed to configure to enable the
69# module. 67# module.
70# 68#
71.if defined(GNOME_VFS_NAME) && !empty(GNOME_VFS_NAME) 69.if defined(GNOME_VFS_NAME) && !empty(GNOME_VFS_NAME)
72GNOME_VFS_FLAG?= ${GNOME_VFS_NAME} 70GNOME_VFS_FLAG?= ${GNOME_VFS_NAME}
73 71
74PKGNAME:= ${DISTNAME:S/gnome-vfs/gnome-vfs-${GNOME_VFS_NAME}/} 72PKGNAME:= ${DISTNAME:S/gnome-vfs/gnome-vfs-${GNOME_VFS_NAME}/}
75CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/} 73CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/}
76COMMENT+= - ${GNOME_VFS_NAME} plugin 74COMMENT+= - ${GNOME_VFS_NAME} plugin
77 75
78CONFLICTS+= ${DISTNAME:S/gnome-vfs/gnome-vfs2-${GNOME_VFS_NAME}/} 76CONFLICTS+= ${DISTNAME:S/gnome-vfs/gnome-vfs2-${GNOME_VFS_NAME}/}
79 77
80BUILD_TARGET= lib${GNOME_VFS_NAME}.la 78BUILD_TARGET= lib${GNOME_VFS_NAME}.la
81BUILD_DIRS= modules 79BUILD_DIRS= modules
82 80
83# Fix paths to already installed libraries (by the gnome-vfs package). 81# Fix paths to already installed libraries (by the gnome-vfs package).
84SUBST_CLASSES+= libs 82SUBST_CLASSES+= libs
85SUBST_MESSAGE.libs= Fixing path to dependent libraries. 83SUBST_MESSAGE.libs= Fixing path to dependent libraries.
86SUBST_STAGE.libs= pre-configure 84SUBST_STAGE.libs= pre-configure
87SUBST_FILES.libs= modules/Makefile.in 85SUBST_FILES.libs= modules/Makefile.in
88SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs}/lib/libgnomevfs-2.la|g' 86SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs}/lib/libgnomevfs-2.la|g'
89 87
90BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=${GNOME_VFS_VERSION} 88BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=${GNOME_VFS_VERSION}
91.include "../../sysutils/gnome-vfs/buildlink3.mk" 89.include "../../sysutils/gnome-vfs/buildlink3.mk"
92 90
93PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ 91PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
94 { print "@comment in gnome-vfs: " $$0; next; } 92 { print "@comment in gnome-vfs: " $$0; next; }
95PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; } 93PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; }
96PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \ 94PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \
97 { print "@comment in gnome-vfs: " $$0; next; } 95 { print "@comment in gnome-vfs: " $$0; next; }
98 96
99INSTALLATION_DIRS+= lib/gnome-vfs-2.0/modules 97INSTALLATION_DIRS+= lib/gnome-vfs-2.0/modules
100 98
101do-install: 99do-install:
102 cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \ 100 cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \
103 ${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \ 101 ${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \
104 ${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules 102 ${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules
105 cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \ 103 cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \
106 ${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules 104 ${DESTDIR}${PREFIX}/lib/gnome-vfs-2.0/modules
107.endif 105.endif
108 106
109.include "../../archivers/bzip2/buildlink3.mk" 107.include "../../archivers/bzip2/buildlink3.mk"
110.include "../../devel/GConf/buildlink3.mk" 108.include "../../devel/GConf/buildlink3.mk"
111.include "../../devel/glib2/buildlink3.mk" 109.include "../../devel/glib2/buildlink3.mk"
112.include "../../security/gnutls/buildlink3.mk" 110.include "../../security/gnutls/buildlink3.mk"
113.include "../../sysutils/dbus-glib/buildlink3.mk" 111.include "../../sysutils/dbus-glib/buildlink3.mk"
114.include "../../textproc/libxml2/buildlink3.mk" 112.include "../../textproc/libxml2/buildlink3.mk"