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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -28,28 +28,29 @@ PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in @@ -28,28 +28,29 @@ PKGCONFIG_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