Thu Apr 23 18:03:42 2009 UTC ()
BROKEN_GETTEXT_DETECTION must be set before including gettext-lib/buildlink3.mk.

This fixes PR 34562.


(minskim)
diff -r1.60 -r1.61 pkgsrc/devel/subversion-base/Makefile
cvs diff -r1.60 -r1.61 pkgsrc/devel/subversion-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/subversion-base/Makefile 2009/04/16 21:42:42 1.60
+++ pkgsrc/devel/subversion-base/Makefile 2009/04/23 18:03:42 1.61
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.60 2009/04/16 21:42:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.61 2009/04/23 18:03:42 minskim Exp $
2 2
3PKGNAME= subversion-base-${SVNVER} 3PKGNAME= subversion-base-${SVNVER}
4PKGREVISION= 2 4PKGREVISION= 2
5COMMENT= Version control system, base programs and libraries 5COMMENT= Version control system, base programs and libraries
6 6
7PKG_INSTALLATION_TYPES= overwrite pkgviews 7PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
 10# on at least solaris, configure fails to figure out
 11# that you need -lintl
 12BROKEN_GETTEXT_DETECTION= yes
 13
10.include "../../devel/subversion/Makefile.common" 14.include "../../devel/subversion/Makefile.common"
11 15
12.if !empty(PKG_OPTIONS:Mapr1) 16.if !empty(PKG_OPTIONS:Mapr1)
13APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util 17APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
14.else 18.else
15APU_OPTIONS= PKG_BUILD_OPTIONS.apr 19APU_OPTIONS= PKG_BUILD_OPTIONS.apr
16.endif 20.endif
17 21
18BUILD_DEFS+= ${APU_OPTIONS} 22BUILD_DEFS+= ${APU_OPTIONS}
19 23
20USE_TOOLS+= msgfmt 24USE_TOOLS+= msgfmt
21 25
22# on at least solaris, configure fails to figure out 
23# that you need -lintl 
24BROKEN_GETTEXT_DETECTION= yes 
25 
26CONFIGURE_ARGS+= --disable-neon-version-check 26CONFIGURE_ARGS+= --disable-neon-version-check
27CONFIGURE_ARGS+= --without-apache 27CONFIGURE_ARGS+= --without-apache
28CONFIGURE_ARGS+= --without-apxs 28CONFIGURE_ARGS+= --without-apxs
29 29
30.if !empty(PKG_OPTIONS:Mapr1) 30.if !empty(PKG_OPTIONS:Mapr1)
31. include "../../devel/apr/buildlink3.mk" 31. include "../../devel/apr/buildlink3.mk"
32. include "../../devel/apr-util/buildlink3.mk" 32. include "../../devel/apr-util/buildlink3.mk"
33. if !empty(PKG_OPTIONS:Mserf) 33. if !empty(PKG_OPTIONS:Mserf)
34DAV_RA= serf 34DAV_RA= serf
35. include "../../www/serf/buildlink3.mk" 35. include "../../www/serf/buildlink3.mk"
36. else 36. else
37BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0 37BUILDLINK_API_DEPENDS.neon+= neon>=0.25.0
38DAV_RA= neon 38DAV_RA= neon