Thu Jan 8 01:00:15 2009 UTC ()
Use pkgsrc standard PKG_USERS usage and remove escape '\' from PKG_USERS.
It should fix build failure with recent NetBSD-current's make.


(obache)
diff -r1.5 -r1.6 pkgsrc/net/avahi/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/net/avahi/Makefile (switch to unified diff)

--- pkgsrc/net/avahi/Makefile 2008/12/28 17:44:37 1.5
+++ pkgsrc/net/avahi/Makefile 2009/01/08 01:00:15 1.6
@@ -1,107 +1,108 @@ @@ -1,107 +1,108 @@
1# $NetBSD: Makefile,v 1.5 2008/12/28 17:44:37 adrianp Exp $ 1# $NetBSD: Makefile,v 1.6 2009/01/08 01:00:15 obache Exp $
2 2
3DISTNAME= avahi-0.6.23 3DISTNAME= avahi-0.6.23
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://avahi.org/download/ 6MASTER_SITES= http://avahi.org/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://avahi.org/ 9HOMEPAGE= http://avahi.org/
10COMMENT= Facilitate service discovery on a local network 10COMMENT= Facilitate service discovery on a local network
11 11
12GNU_CONFIGURE= YES 12GNU_CONFIGURE= YES
13USE_DIRS+= xdg-1.4 13USE_DIRS+= xdg-1.4
14USE_LIBTOOL= YES 14USE_LIBTOOL= YES
15USE_PKGINSTALL= YES 15USE_PKGINSTALL= YES
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17USE_TOOLS+= pkg-config gmake intltool msgfmt 17USE_TOOLS+= pkg-config gmake intltool msgfmt
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
19 19
20PKGCONFIG_OVERRIDE+= avahi-client.pc.in 20PKGCONFIG_OVERRIDE+= avahi-client.pc.in
21PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in 21PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in
22PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in 22PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in
23PKGCONFIG_OVERRIDE+= avahi-core.pc.in 23PKGCONFIG_OVERRIDE+= avahi-core.pc.in
24PKGCONFIG_OVERRIDE+= avahi-glib.pc.in 24PKGCONFIG_OVERRIDE+= avahi-glib.pc.in
25PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in 25PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in
26PKGCONFIG_OVERRIDE+= avahi-qt3.pc.in 26PKGCONFIG_OVERRIDE+= avahi-qt3.pc.in
27PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in 27PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in
28PKGCONFIG_OVERRIDE+= avahi-sharp.pc.in 28PKGCONFIG_OVERRIDE+= avahi-sharp.pc.in
29PKGCONFIG_OVERRIDE+= avahi-ui-sharp.pc.in 29PKGCONFIG_OVERRIDE+= avahi-ui-sharp.pc.in
30PKGCONFIG_OVERRIDE+= avahi-ui.pc.in 30PKGCONFIG_OVERRIDE+= avahi-ui.pc.in
31 31
32AVAHI_USER= avahi 32AVAHI_USER= avahi
33AVAHI_GROUP= avahi 33AVAHI_GROUP= avahi
34RCD_SCRIPTS= avahidaemon 34RCD_SCRIPTS= avahidaemon
35BUILD_DEFS= VARBASE PKG_SYSCONFBASE 35BUILD_DEFS= VARBASE PKG_SYSCONFBASE
36PLIST_SRC= ${PKGDIR}/PLIST 36PLIST_SRC= ${PKGDIR}/PLIST
37PKG_SYSCONFSUBDIR= avahi 37PKG_SYSCONFSUBDIR= avahi
38USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
39MAKE_DIRS= ${PKG_SYSCONFDIR}/services 39MAKE_DIRS= ${PKG_SYSCONFDIR}/services
40 40
41PKG_USERS= ${AVAHI_USER}:${AVAHI_GROUP}::Avahi\ user:/nonexistent 41PKG_USERS= ${AVAHI_USER}:${AVAHI_GROUP}
42PKG_GROUPS= ${AVAHI_GROUP} 42PKG_GROUPS= ${AVAHI_GROUP}
 43PKG_GECOS.${AVAHI_USER}= Avahi user
43 44
44.include "options.mk" 45.include "options.mk"
45 46
46.if ${OPSYS} == "NetBSD" 47.if ${OPSYS} == "NetBSD"
47CFLAGS+= -D_NETBSD_SOURCE 48CFLAGS+= -D_NETBSD_SOURCE
48.endif 49.endif
49 50
50PLIST_SRC+= ${PKGDIR}/PLIST.shared 51PLIST_SRC+= ${PKGDIR}/PLIST.shared
51 52
52CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-daemon.conf \ 53CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-daemon.conf \
53 ${PKG_SYSCONFDIR}/avahi-daemon.conf 54 ${PKG_SYSCONFDIR}/avahi-daemon.conf
54CONF_FILES+= ${PREFIX}/share/examples/avahi/hosts \ 55CONF_FILES+= ${PREFIX}/share/examples/avahi/hosts \
55 ${PKG_SYSCONFDIR}/hosts 56 ${PKG_SYSCONFDIR}/hosts
56CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dnsconfd.action \ 57CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dnsconfd.action \
57 ${PKG_SYSCONFDIR}/avahi-dnsconfd.action 58 ${PKG_SYSCONFDIR}/avahi-dnsconfd.action
58CONF_FILES+= ${PREFIX}/share/examples/avahi/ssh.service \ 59CONF_FILES+= ${PREFIX}/share/examples/avahi/ssh.service \
59 ${PKG_SYSCONFDIR}/services/ssh.service 60 ${PKG_SYSCONFDIR}/services/ssh.service
60CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \ 61CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
61 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf 62 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
62 63
63CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER:Q} 64CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER:Q}
64CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP:Q} 65CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP:Q}
65CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 66CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
66CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 67CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
67CONFIGURE_ARGS+= --disable-qt3 68CONFIGURE_ARGS+= --disable-qt3
68CONFIGURE_ARGS+= --disable-qt4 69CONFIGURE_ARGS+= --disable-qt4
69CONFIGURE_ARGS+= --disable-mono 70CONFIGURE_ARGS+= --disable-mono
70CONFIGURE_ARGS+= --disable-monodoc 71CONFIGURE_ARGS+= --disable-monodoc
71CONFIGURE_ARGS+= --disable-doxygen-doc 72CONFIGURE_ARGS+= --disable-doxygen-doc
72CONFIGURE_ARGS+= --disable-doxygen-dot 73CONFIGURE_ARGS+= --disable-doxygen-dot
73CONFIGURE_ARGS+= --disable-doxygen-html 74CONFIGURE_ARGS+= --disable-doxygen-html
74CONFIGURE_ARGS+= --disable-xmltoman 75CONFIGURE_ARGS+= --disable-xmltoman
75CONFIGURE_ARGS+= --disable-autoipd 76CONFIGURE_ARGS+= --disable-autoipd
76 77
77post-install: 78post-install:
78 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/avahi 79 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/avahi
79 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avahi 80 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avahi
80 ${MKDIR} ${PKG_SYSCONFDIR}/services 81 ${MKDIR} ${PKG_SYSCONFDIR}/services
81 82
82 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-daemon.conf \ 83 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-daemon.conf \
83 ${PREFIX}/share/examples/avahi 84 ${PREFIX}/share/examples/avahi
84 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/hosts \ 85 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/hosts \
85 ${PREFIX}/share/examples/avahi 86 ${PREFIX}/share/examples/avahi
86 ${INSTALL_DATA} ${WRKSRC}/avahi-dnsconfd/avahi-dnsconfd.action \ 87 ${INSTALL_DATA} ${WRKSRC}/avahi-dnsconfd/avahi-dnsconfd.action \
87 ${PREFIX}/share/examples/avahi 88 ${PREFIX}/share/examples/avahi
88 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/ssh.service \ 89 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/ssh.service \
89 ${PREFIX}/share/examples/avahi 90 ${PREFIX}/share/examples/avahi
90 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-dbus.conf \ 91 ${INSTALL_DATA} ${WRKSRC}/avahi-daemon/avahi-dbus.conf \
91 ${PREFIX}/share/examples/avahi/avahi-dbus.conf 92 ${PREFIX}/share/examples/avahi/avahi-dbus.conf
92 93
93 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${PREFIX}/share/doc/avahi 94 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${PREFIX}/share/doc/avahi
94 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${PREFIX}/share/doc/avahi 95 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${PREFIX}/share/doc/avahi
95 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${PREFIX}/share/doc/avahi 96 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${PREFIX}/share/doc/avahi
96 ${INSTALL_DATA} ${WRKSRC}/docs/README ${PREFIX}/share/doc/avahi 97 ${INSTALL_DATA} ${WRKSRC}/docs/README ${PREFIX}/share/doc/avahi
97 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${PREFIX}/share/doc/avahi 98 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${PREFIX}/share/doc/avahi
98 99
99.include "../../devel/gettext-lib/buildlink3.mk" 100.include "../../devel/gettext-lib/buildlink3.mk"
100.include "../../devel/glib2/buildlink3.mk" 101.include "../../devel/glib2/buildlink3.mk"
101.include "../../devel/libdaemon/buildlink3.mk" 102.include "../../devel/libdaemon/buildlink3.mk"
102.include "../../devel/libglade/buildlink3.mk" 103.include "../../devel/libglade/buildlink3.mk"
103.include "../../sysutils/dbus/buildlink3.mk" 104.include "../../sysutils/dbus/buildlink3.mk"
104.include "../../textproc/expat/buildlink3.mk" 105.include "../../textproc/expat/buildlink3.mk"
105.include "../../x11/gtk2/buildlink3.mk" 106.include "../../x11/gtk2/buildlink3.mk"
106.include "../../mk/pthread.buildlink3.mk" 107.include "../../mk/pthread.buildlink3.mk"
107.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"