Wed Jan 11 22:41:46 2012 UTC ()
Improve GCC version handling:
1.) Set minimum required GCC version to 4.1.3 because that is what has
    been tested. Based on the bug-report it also seems that GCC 4.0.1
    doesn't work.
2.) GCC 4.1.3 (as distributed with NetBSD 5.*) works fine under
    NetBSD/macppc as reported by Matthias Kretschmer on IRCnet.
    So don't insist on GCC 4.2.1 for this platform. This fixes seems
    to fix the build as the GCC 4.4.6 package doesn't build for
    this platform.


(tron)
diff -r1.42 -r1.43 pkgsrc/net/libtorrent/Makefile
diff -r1.46 -r1.47 pkgsrc/net/rtorrent/Makefile
cvs diff -r1.42 -r1.43 pkgsrc/net/libtorrent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/Makefile 2011/11/07 13:10:31 1.42
+++ pkgsrc/net/libtorrent/Makefile 2012/01/11 22:41:46 1.43
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.42 2011/11/07 13:10:31 hans Exp $ 1# $NetBSD: Makefile,v 1.43 2012/01/11 22:41:46 tron Exp $
2 2
3DISTNAME= libtorrent-0.12.9 3DISTNAME= libtorrent-0.12.9
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${HOMEPAGE:=downloads/} 5MASTER_SITES= ${HOMEPAGE:=downloads/}
6 6
7OWNER= tron@NetBSD.org 7OWNER= tron@NetBSD.org
8HOMEPAGE= http://libtorrent.rakshasa.no/ 8HOMEPAGE= http://libtorrent.rakshasa.no/
9COMMENT= BitTorrent library written in C++ for *nix 9COMMENT= BitTorrent library written in C++ for *nix
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --disable-debug 18CONFIGURE_ARGS+= --disable-debug
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21.if ${MACHINE_ARCH} == "alpha" || \ 21.if ${MACHINE_ARCH} == "alpha" || \
22 ${MACHINE_ARCH} == "i386" || \ 22 ${MACHINE_ARCH} == "i386" || \
 23 ${MACHINE_ARCH} == "powerpc" || \
23 ${MACHINE_ARCH} == "x86_64" 24 ${MACHINE_ARCH} == "x86_64"
24GCC_REQD+= 3.3 25GCC_REQD+= 4.1.3
25.else 26.else
26GCC_REQD+= 4.2.1 27GCC_REQD+= 4.2.1
27.endif 28.endif
28 29
29# configure check is fooled by trap & emulate of unaligned access on alpha 30# configure check is fooled by trap & emulate of unaligned access on alpha
30.if (${MACHINE_ARCH} == "alpha") 31.if (${MACHINE_ARCH} == "alpha")
31CONFIGURE_ARGS+= --enable-aligned 32CONFIGURE_ARGS+= --enable-aligned
32.endif 33.endif
33 34
34.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" 35.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
35CONFIGURE_ARGS+= --with-kqueue 36CONFIGURE_ARGS+= --with-kqueue
36.endif 37.endif
37 38
cvs diff -r1.46 -r1.47 pkgsrc/net/rtorrent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/Makefile 2011/11/07 13:10:31 1.46
+++ pkgsrc/net/rtorrent/Makefile 2012/01/11 22:41:46 1.47
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.46 2011/11/07 13:10:31 hans Exp $ 1# $NetBSD: Makefile,v 1.47 2012/01/11 22:41:46 tron Exp $
2 2
3DISTNAME= rtorrent-0.8.9 3DISTNAME= rtorrent-0.8.9
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${HOMEPAGE:=downloads/} 6MASTER_SITES= ${HOMEPAGE:=downloads/}
7 7
8OWNER= tron@NetBSD.org 8OWNER= tron@NetBSD.org
9HOMEPAGE= http://libtorrent.rakshasa.no/ 9HOMEPAGE= http://libtorrent.rakshasa.no/
10COMMENT= Ncurses based torrent client with support for sessions 10COMMENT= Ncurses based torrent client with support for sessions
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_NCURSES= yes # chgat 17USE_NCURSES= yes # chgat
18USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22.if ${MACHINE_ARCH} == "alpha" || \ 22.if ${MACHINE_ARCH} == "alpha" || \
23 ${MACHINE_ARCH} == "i386" || \ 23 ${MACHINE_ARCH} == "i386" || \
 24 ${MACHINE_ARCH} == "powerpc" || \
24 ${MACHINE_ARCH} == "x86_64" 25 ${MACHINE_ARCH} == "x86_64"
25GCC_REQD+= 3.3 26GCC_REQD+= 4.1.3
26.else 27.else
27GCC_REQD+= 4.2.1 28GCC_REQD+= 4.2.1
28.endif 29.endif
29 30
30.include "../../mk/pthread.buildlink3.mk" 31.include "../../mk/pthread.buildlink3.mk"
31LDFLAGS+= ${PTHREAD_LDFLAGS} 32LDFLAGS+= ${PTHREAD_LDFLAGS}
32 33
33.include "options.mk" 34.include "options.mk"
34 35
35.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" 36.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
36MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD 37MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD
37.endif 38.endif
38 39