Wed Apr 18 14:06:58 2012 UTC ()
Pullup ticket #3745 - requested by hauke
net/netatalk: build fix

Revisions pulled up:
- net/netatalk/Makefile                                         1.82

---
   Module Name:    pkgsrc
   Committed By:   hauke
   Date:           Tue Apr 17 16:14:54 UTC 2012

   Modified Files:
           pkgsrc/net/netatalk: Makefile

   Log Message:
   As a workaround to PR pkg/46072, build Netatalk explicitely without
   quota support for NetBSD 5.99.62 and newer, until we have patches
   supporting the new quota interface.


(tron)
diff -r1.81 -r1.81.2.1 pkgsrc/net/netatalk/Makefile
cvs diff -r1.81 -r1.81.2.1 pkgsrc/net/netatalk/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/Makefile 2012/02/06 12:41:16 1.81
+++ pkgsrc/net/netatalk/Attic/Makefile 2012/04/18 14:06:58 1.81.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.81 2012/02/06 12:41:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.81.2.1 2012/04/18 14:06:58 tron Exp $
2 2
3DISTNAME= netatalk-2.2.1 3DISTNAME= netatalk-2.2.1
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= net print 5CATEGORIES= net print
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8#PATCHFILES= patch-adv1tov2.c 8#PATCHFILES= patch-adv1tov2.c
9PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \ 9PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
10 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/ 10 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
11 11
12MAINTAINER= markd@NetBSD.org 12MAINTAINER= markd@NetBSD.org
13HOMEPAGE= http://netatalk.sourceforge.net/ 13HOMEPAGE= http://netatalk.sourceforge.net/
14COMMENT= Netatalk appletalk file and print services 14COMMENT= Netatalk appletalk file and print services
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
@@ -32,36 +32,43 @@ CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SY @@ -32,36 +32,43 @@ CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SY
32CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf 32CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
33CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf 33CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
34CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf 34CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
35 35
36CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]* 36CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40BUILD_DEFS+= VARBASE 40BUILD_DEFS+= VARBASE
41CONFIGURE_ARGS+= --enable-netbsd 41CONFIGURE_ARGS+= --enable-netbsd
42CONFIGURE_ARGS+= --enable-overwrite 42CONFIGURE_ARGS+= --enable-overwrite
43CONFIGURE_ARGS+= --enable-timelord 43CONFIGURE_ARGS+= --enable-timelord
44CONFIGURE_ARGS+= --enable-ddp 44CONFIGURE_ARGS+= --enable-ddp
45CONFIGURE_ARGS+= --enable-quota 
46CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk 45CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk
47CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk 46CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk
48CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} 47CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
49CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg 48CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg
50CONFIGURE_ARGS+= --localstatedir=${VARBASE}/netatalk 49CONFIGURE_ARGS+= --localstatedir=${VARBASE}/netatalk
51CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams 50CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams
52CONFIGURE_ARGS+= --with-bdb=${BDBBASE} 51CONFIGURE_ARGS+= --with-bdb=${BDBBASE}
53CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 52CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
54 53
 54# XXX Waiting for NetBSD quota patches
 55.if empty(MACHINE_PLATFORM:MNetBSD-5.99.6[2-5]*) && \
 56 empty(MACHINE_PLATFORM:MNetBSD-[6-9]*)
 57CONFIGURE_ARGS+= --enable-quota
 58.else
 59CONFIGURE_ARGS+= --disable-quota
 60.endif
 61
55MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg 62MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg
56 63
57SUBST_CLASSES+= paths 64SUBST_CLASSES+= paths
58SUBST_MESSAGE.paths= Fixing hardcoded paths. 65SUBST_MESSAGE.paths= Fixing hardcoded paths.
59SUBST_STAGE.paths= pre-configure 66SUBST_STAGE.paths= pre-configure
60SUBST_FILES.paths= etc/psf/etc2ps.sh distrib/initscripts/Makefile.in 67SUBST_FILES.paths= etc/psf/etc2ps.sh distrib/initscripts/Makefile.in
61SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3," 68SUBST_SED.paths= -e "s,^\\(DVIPS=\\)\\(/usr/local/tex\\)\\(/bin\\),\\1${PREFIX}\\3,"
62 69
63RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad 70RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad
64.for f in ${RCD_SCRIPTS} 71.for f in ${RCD_SCRIPTS}
65RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f} 72RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f}
66.endfor 73.endfor
67 74