Sat Dec 7 21:07:56 2013 UTC ()
Fix broken gcc build.


(dholland)
diff -r1.28 -r1.29 pkgsrc/devel/aegis/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/aegis/distinfo
diff -r0 -r1.1 pkgsrc/devel/aegis/patches/patch-common_stack.cc
cvs diff -r1.28 -r1.29 pkgsrc/devel/aegis/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/aegis/Makefile 2013/05/31 12:39:57 1.28
+++ pkgsrc/devel/aegis/Makefile 2013/12/07 21:07:56 1.29
@@ -1,35 +1,39 @@ @@ -1,35 +1,39 @@
1# $NetBSD: Makefile,v 1.28 2013/05/31 12:39:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2013/12/07 21:07:56 dholland Exp $
2# 2#
3 3
4DISTNAME= aegis-4.24.2 4DISTNAME= aegis-4.24.2
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= devel scm 6CATEGORIES= devel scm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aegis/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aegis/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://aegis.sourceforge.net/ 10HOMEPAGE= http://aegis.sourceforge.net/
11COMMENT= Aegis is a transaction base software configuration management system 11COMMENT= Aegis is a transaction base software configuration management system
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_TOOLS+= groff gsoelim msgfmt perl:run yacc patch:run 19USE_TOOLS+= groff gsoelim msgfmt perl:run yacc patch:run
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
 23.if !empty(PKGSRC_COMPILER:Mgcc)
 24CXXFLAGS+= -std=gnu++0x
 25.endif
 26
23AEGIS_USER_UID?= 3 27AEGIS_USER_UID?= 3
24AEGIS_USER_GID?= 3 28AEGIS_USER_GID?= 3
25 29
26CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR} 30CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR}
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
28CONFIGURE_ARGS+= --with-no-aegis-configured 32CONFIGURE_ARGS+= --with-no-aegis-configured
29CONFIGURE_ARGS+= --sharedstatedir=${PREFIX}/com/aegis 33CONFIGURE_ARGS+= --sharedstatedir=${PREFIX}/com/aegis
30CONFIGURE_ENV+= PATCH=${PATCH:Q} 34CONFIGURE_ENV+= PATCH=${PATCH:Q}
31CONFIGURE_ENV+= AEGIS_UID=${AEGIS_USER_UID:Q} 35CONFIGURE_ENV+= AEGIS_UID=${AEGIS_USER_UID:Q}
32CONFIGURE_ENV+= AEGIS_GID=${AEGIS_USER_GID:Q} 36CONFIGURE_ENV+= AEGIS_GID=${AEGIS_USER_GID:Q}
33 37
34EGDIR= ${PREFIX}/share/examples/aegis 38EGDIR= ${PREFIX}/share/examples/aegis
35INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 39INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
cvs diff -r1.11 -r1.12 pkgsrc/devel/aegis/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/aegis/distinfo 2013/05/04 12:59:45 1.11
+++ pkgsrc/devel/aegis/distinfo 2013/12/07 21:07:56 1.12
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.11 2013/05/04 12:59:45 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2013/12/07 21:07:56 dholland Exp $
2 2
3SHA1 (aegis-4.24.2.tar.gz) = 3051a4272cfb3d1dcadec0234a5cd06a3d96e36b 3SHA1 (aegis-4.24.2.tar.gz) = 3051a4272cfb3d1dcadec0234a5cd06a3d96e36b
4RMD160 (aegis-4.24.2.tar.gz) = 3bbf6d29295d04313ab8e2a7cb2d80464c338c6b 4RMD160 (aegis-4.24.2.tar.gz) = 3bbf6d29295d04313ab8e2a7cb2d80464c338c6b
5Size (aegis-4.24.2.tar.gz) = 4180025 bytes 5Size (aegis-4.24.2.tar.gz) = 4180025 bytes
6SHA1 (patch-aa) = 90ca2d4c6e42588b52133a8772cb658608fe43b2 6SHA1 (patch-aa) = 90ca2d4c6e42588b52133a8772cb658608fe43b2
7SHA1 (patch-ab) = c946cdfd7807041502f8052b0e9ec2d24f752175 7SHA1 (patch-ab) = c946cdfd7807041502f8052b0e9ec2d24f752175
8SHA1 (patch-ad) = 3385dc23da50afc6827664c8d481ba89ba3fd435 8SHA1 (patch-ad) = 3385dc23da50afc6827664c8d481ba89ba3fd435
 9SHA1 (patch-common_stack.cc) = 83451680c73027fe69b85e0fd3333642d340a750
File Added: pkgsrc/devel/aegis/patches/patch-common_stack.cc
$NetBSD: patch-common_stack.cc,v 1.1 2013/12/07 21:07:56 dholland Exp $

Fix build with the latest C++ "standard".

--- common/stack.cc~	2009-06-25 16:00:55.000000000 +0000
+++ common/stack.cc
@@ -24,7 +24,7 @@ static int
 find_stack_direction ()
 {
     static char *addr = 0;
-    auto char dummy;
+    char dummy;
     if (addr == 0)
     {
 	addr = &dummy;
@@ -47,7 +47,7 @@ variable_is_on_stack(void *p)
 	return false;
     if (stack_direction == 0)
 	stack_direction = find_stack_direction();
-    auto char dummy = 0;
+    char dummy = 0;
     char *cp = (char *)p;
     return (stack_direction < 0 ?  (&dummy < cp) : (&dummy > cp));
 }