Thu Dec 31 20:04:14 2020 UTC ()
Normalize handling packages that require 64-bit atomic ops.


(nia)
diff -r1.137 -r1.138 pkgsrc/audio/audacity/Makefile
diff -r1.90 -r1.91 pkgsrc/audio/cmus/Makefile
diff -r1.8 -r1.9 pkgsrc/databases/kyotocabinet/Makefile
diff -r1.29 -r1.30 pkgsrc/databases/mysql57-client/Makefile.common
diff -r1.1 -r0 pkgsrc/databases/mysql57-client/hacks.mk
diff -r1.1 -r0 pkgsrc/databases/mysql57-server/hacks.mk
diff -r1.62 -r1.63 pkgsrc/databases/redis/Makefile
diff -r1.35 -r1.36 pkgsrc/devel/protobuf/Makefile
diff -r1.1 -r0 pkgsrc/devel/protobuf/hacks.mk
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-parallel-n64/Makefile
diff -r1.50 -r1.51 pkgsrc/games/lgogdownloader/Makefile
diff -r1.37 -r1.38 pkgsrc/games/supertuxkart/Makefile
diff -r1.222 -r1.223 pkgsrc/graphics/inkscape/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/mozjs78/Makefile
diff -r1.204 -r1.205 pkgsrc/lang/nodejs/Makefile
diff -r1.26 -r1.27 pkgsrc/lang/nodejs12/Makefile
diff -r1.247 -r1.248 pkgsrc/misc/libreoffice/Makefile
diff -r0 -r1.1 pkgsrc/mk/atomic64.mk
diff -r1.14 -r1.15 pkgsrc/multimedia/lightspark/Makefile
diff -r1.119 -r1.120 pkgsrc/multimedia/mpv/Makefile
diff -r1.132 -r1.133 pkgsrc/net/filezilla/Makefile
diff -r1.108 -r1.109 pkgsrc/net/freeradius/Makefile
diff -r1.2 -r0 pkgsrc/net/freeradius/hacks.mk
diff -r1.1 -r1.2 pkgsrc/net/frr/Makefile
diff -r1.34 -r1.35 pkgsrc/net/grpc/Makefile
diff -r1.40 -r1.41 pkgsrc/print/qpdf/Makefile
diff -r1.1 -r0 pkgsrc/print/qpdf/hacks.mk
diff -r1.26 -r1.27 pkgsrc/sysutils/rsyslog/Makefile
diff -r1.191 -r1.192 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.12 -r1.13 pkgsrc/www/firefox52/mozilla-common.mk
diff -r1.16 -r1.17 pkgsrc/www/firefox68/mozilla-common.mk
diff -r1.6 -r1.7 pkgsrc/www/firefox78/mozilla-common.mk
diff -r1.6 -r1.7 pkgsrc/www/seamonkey/mozilla-common.mk
diff -r1.199 -r1.200 pkgsrc/www/webkit-gtk/Makefile
diff -r1.2 -r0 pkgsrc/www/webkit-gtk/hacks.mk
diff -r1.19 -r1.20 pkgsrc/www/webkit24-gtk/Makefile.common
diff -r1.2 -r0 pkgsrc/www/webkit24-gtk/hacks.mk
diff -r1.2 -r0 pkgsrc/www/webkit24-gtk3/hacks.mk
diff -r1.84 -r1.85 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs diff -r1.137 -r1.138 pkgsrc/audio/audacity/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/audacity/Makefile 2020/11/13 16:09:47 1.137
+++ pkgsrc/audio/audacity/Makefile 2020/12/31 20:04:11 1.138
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.137 2020/11/13 16:09:47 nia Exp $ 1# $NetBSD: Makefile,v 1.138 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= audacity-2.4.1 3DISTNAME= audacity-2.4.1
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=audacity/}
7GITHUB_PROJECT= Audacity 7GITHUB_PROJECT= Audacity
8GITHUB_TAG= Audacity-${PKGVERSION_NOREV} 8GITHUB_TAG= Audacity-${PKGVERSION_NOREV}
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://www.audacityteam.org/ 11HOMEPAGE= https://www.audacityteam.org/
12COMMENT= Multi-track audio editor and recorder 12COMMENT= Multi-track audio editor and recorder
13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license 13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
14 14
@@ -43,36 +43,26 @@ CONFIGURE_ARGS+= --with-midi="no" @@ -43,36 +43,26 @@ CONFIGURE_ARGS+= --with-midi="no"
43CONFIGURE_ARGS+= --with-portmidi="no" 43CONFIGURE_ARGS+= --with-portmidi="no"
44CONFIGURE_ARGS+= --with-ffmpeg="system" 44CONFIGURE_ARGS+= --with-ffmpeg="system"
45CONFIGURE_ARGS+= --with-lame="system" 45CONFIGURE_ARGS+= --with-lame="system"
46CONFIGURE_ARGS+= --with-libflac="system" 46CONFIGURE_ARGS+= --with-libflac="system"
47CONFIGURE_ARGS+= --with-libid3tag="system" 47CONFIGURE_ARGS+= --with-libid3tag="system"
48CONFIGURE_ARGS+= --with-libtwolame="system" 48CONFIGURE_ARGS+= --with-libtwolame="system"
49CONFIGURE_ARGS+= --with-libvamp="system" 49CONFIGURE_ARGS+= --with-libvamp="system"
50CONFIGURE_ARGS+= --with-libvorbis="system" 50CONFIGURE_ARGS+= --with-libvorbis="system"
51CONFIGURE_ARGS+= --with-lv2="system" 51CONFIGURE_ARGS+= --with-lv2="system"
52CONFIGURE_ARGS+= --with-soundtouch="system" 52CONFIGURE_ARGS+= --with-soundtouch="system"
53 53
54.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
55 55
56# 64 bit atomic ops are required 
57 
58.if ${MACHINE_ARCH} == "i386" 
59CXXFLAGS+= -march=i586 
60.endif 
61 
62.if ${MACHINE_ARCH} == "powerpc" 
63.include "../../devel/libatomic/buildlink3.mk" 
64.endif 
65 
66.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 56.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
67CONFIGURE_ARGS+= --disable-sse 57CONFIGURE_ARGS+= --disable-sse
68.endif 58.endif
69 59
70CFLAGS.SunOS+= -fPIC 60CFLAGS.SunOS+= -fPIC
71 61
72LIBS.NetBSD+= -lcompat 62LIBS.NetBSD+= -lcompat
73 63
74CONFIG_GUESS_OVERRIDE= \ 64CONFIG_GUESS_OVERRIDE= \
75 config.guess */config.guess */*/config.guess */*/*/config.guess 65 config.guess */config.guess */*/config.guess */*/*/config.guess
76CONFIG_SUB_OVERRIDE= \ 66CONFIG_SUB_OVERRIDE= \
77 config.sub */config.sub */*/config.sub */*/*/config.sub 67 config.sub */config.sub */*/config.sub */*/*/config.sub
78 68
@@ -107,14 +97,15 @@ BUILDLINK_API_DEPENDS.portaudio+= portau @@ -107,14 +97,15 @@ BUILDLINK_API_DEPENDS.portaudio+= portau
107.include "../../audio/suil/buildlink3.mk" 97.include "../../audio/suil/buildlink3.mk"
108.include "../../audio/vamp-plugin-sdk/buildlink3.mk" 98.include "../../audio/vamp-plugin-sdk/buildlink3.mk"
109.include "../../devel/gettext-lib/buildlink3.mk" 99.include "../../devel/gettext-lib/buildlink3.mk"
110.include "../../devel/zlib/buildlink3.mk" 100.include "../../devel/zlib/buildlink3.mk"
111BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0 101BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
112.include "../../audio/flac/buildlink3.mk" 102.include "../../audio/flac/buildlink3.mk"
113.include "../../multimedia/ffmpeg4/buildlink3.mk" 103.include "../../multimedia/ffmpeg4/buildlink3.mk"
114.include "../../multimedia/libogg/buildlink3.mk" 104.include "../../multimedia/libogg/buildlink3.mk"
115.include "../../textproc/expat/buildlink3.mk" 105.include "../../textproc/expat/buildlink3.mk"
116.include "../../x11/wxGTK30/buildlink3.mk" 106.include "../../x11/wxGTK30/buildlink3.mk"
117.include "../../mk/dlopen.buildlink3.mk" 107.include "../../mk/dlopen.buildlink3.mk"
118BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 108BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
119.include "../../mk/pthread.buildlink3.mk" 109.include "../../mk/pthread.buildlink3.mk"
 110.include "../../mk/atomic64.mk"
120.include "../../mk/bsd.pkg.mk" 111.include "../../mk/bsd.pkg.mk"
cvs diff -r1.90 -r1.91 pkgsrc/audio/cmus/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cmus/Makefile 2020/11/13 16:10:43 1.90
+++ pkgsrc/audio/cmus/Makefile 2020/12/31 20:04:11 1.91
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.90 2020/11/13 16:10:43 nia Exp $ 1# $NetBSD: Makefile,v 1.91 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= cmus-2.8.0 3DISTNAME= cmus-2.8.0
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=cmus/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=cmus/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ahoka@NetBSD.org 9MAINTAINER= ahoka@NetBSD.org
10HOMEPAGE= https://cmus.github.io/ 10HOMEPAGE= https://cmus.github.io/
11COMMENT= Small, fast and powerful text mode music player 11COMMENT= Small, fast and powerful text mode music player
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -37,28 +37,19 @@ CONFIGURE_ARGS+= CONFIG_OSS=n @@ -37,28 +37,19 @@ CONFIGURE_ARGS+= CONFIG_OSS=n
37.endif 37.endif
38 38
39.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h) 39.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
40CONFIGURE_ARGS+= CONFIG_SUN=y 40CONFIGURE_ARGS+= CONFIG_SUN=y
41PLIST.sunaudio= yes 41PLIST.sunaudio= yes
42.else 42.else
43CONFIGURE_ARGS+= CONFIG_SUN=n 43CONFIGURE_ARGS+= CONFIG_SUN=n
44.endif 44.endif
45 45
46.if ${OPSYS} == "Darwin" 46.if ${OPSYS} == "Darwin"
47PLIST.coreaudio= yes 47PLIST.coreaudio= yes
48.endif 48.endif
49 49
50# 64 bit atomic ops are required 
51 
52.if ${MACHINE_ARCH} == "i386" 
53CFLAGS+= -march=i586 
54.endif 
55 
56.if ${MACHINE_ARCH} == "powerpc" 
57.include "../../devel/libatomic/buildlink3.mk" 
58.endif 
59 
60.include "options.mk" 50.include "options.mk"
 51.include "../../mk/atomic64.mk"
61.include "../../mk/dlopen.buildlink3.mk" 52.include "../../mk/dlopen.buildlink3.mk"
62.include "../../converters/libiconv/buildlink3.mk" 53.include "../../converters/libiconv/buildlink3.mk"
63.include "../../devel/ncursesw/buildlink3.mk" 54.include "../../devel/ncursesw/buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/databases/kyotocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/kyotocabinet/Makefile 2020/11/23 14:00:39 1.8
+++ pkgsrc/databases/kyotocabinet/Makefile 2020/12/31 20:04:11 1.9
@@ -1,39 +1,27 @@ @@ -1,39 +1,27 @@
1# $NetBSD: Makefile,v 1.8 2020/11/23 14:00:39 nia Exp $ 1# $NetBSD: Makefile,v 1.9 2020/12/31 20:04:11 nia Exp $
2# 2#
3 3
4DISTNAME= kyotocabinet-1.2.78 4DISTNAME= kyotocabinet-1.2.78
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= https://dbmx.net/kyotocabinet/pkg/ 6MASTER_SITES= https://dbmx.net/kyotocabinet/pkg/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://dbmx.net/kyotocabinet/ 9HOMEPAGE= https://dbmx.net/kyotocabinet/
10COMMENT= Straightforward implementation of DBM 10COMMENT= Straightforward implementation of DBM
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17 17
18PKGCONFIG_OVERRIDE+= kyotocabinet.pc.in 18PKGCONFIG_OVERRIDE+= kyotocabinet.pc.in
19 19
20.include "options.mk" 20.include "options.mk"
21 21
22TEST_TARGET= check 22TEST_TARGET= check
23 23
24PTHREAD_AUTO_VARS= yes 24PTHREAD_AUTO_VARS= yes
25.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
26 26.include "../../mk/atomic64.mk"
27.include "../../mk/bsd.prefs.mk" 
28.include "../../mk/compiler.mk" 
29# using GCC atomic functions only available with i586 in kcthread.cc 
30.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi[34]86) 
31GNU_ARCH.i386= i586 
32CFLAGS+= -march=i586 
33.endif 
34 
35.if ${MACHINE_ARCH} == "powerpc" 
36.include "../../devel/libatomic/buildlink3.mk" 
37.endif 
38 
39.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/databases/mysql57-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/Makefile.common 2020/10/21 13:34:50 1.29
+++ pkgsrc/databases/mysql57-client/Makefile.common 2020/12/31 20:04:11 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.29 2020/10/21 13:34:50 adam Exp $ 1# $NetBSD: Makefile.common,v 1.30 2020/12/31 20:04:11 nia Exp $
2# 2#
3# used by databases/mysql57-client/Makefile 3# used by databases/mysql57-client/Makefile
4# used by databases/mysql57-server/Makefile 4# used by databases/mysql57-server/Makefile
5 5
6DISTNAME= mysql-5.7.32 6DISTNAME= mysql-5.7.32
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mysql.com/ 11HOMEPAGE= https://www.mysql.com/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql57-client/distinfo
@@ -65,32 +65,26 @@ CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DAT @@ -65,32 +65,26 @@ CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DAT
65CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 65CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
66 66
67CMAKE_ARGS+= -DWITH_BOOST="system" 67CMAKE_ARGS+= -DWITH_BOOST="system"
68CMAKE_ARGS+= -DWITH_EDITLINE="system" 68CMAKE_ARGS+= -DWITH_EDITLINE="system"
69CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline:Q}/${BUILDLINK_INCDIRS.editline} 69CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline:Q}/${BUILDLINK_INCDIRS.editline}
70CMAKE_ARGS+= -DWITH_LIBEVENT="system" 70CMAKE_ARGS+= -DWITH_LIBEVENT="system"
71CMAKE_ARGS+= -DWITH_LZ4="system" 71CMAKE_ARGS+= -DWITH_LZ4="system"
72CMAKE_ARGS+= -DWITH_SSL="system" 72CMAKE_ARGS+= -DWITH_SSL="system"
73CMAKE_ARGS+= -DWITH_ZLIB="system" 73CMAKE_ARGS+= -DWITH_ZLIB="system"
74CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET} 74CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET}
75CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION} 75CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION}
76CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET} 76CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
77 77
78# we need atomic builtins 
79.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 
80GNU_ARCH.i386= i586 
81CFLAGS+= -march=i586 
82.endif 
83 
84CPPFLAGS+= -Dunix 78CPPFLAGS+= -Dunix
85CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat 79CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat
86#CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late 80#CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late
87 81
88.if ${OPSYS} != "Interix" 82.if ${OPSYS} != "Interix"
89CFLAGS+= -fPIC -DPIC 83CFLAGS+= -fPIC -DPIC
90CXXFLAGS+= -fPIC -DPIC 84CXXFLAGS+= -fPIC -DPIC
91.endif 85.endif
92 86
93CMAKE_ARGS.SunOS+= -DFORCE_UNSUPPORTED_COMPILER=YES 87CMAKE_ARGS.SunOS+= -DFORCE_UNSUPPORTED_COMPILER=YES
94 88
95# Force HAVE_CURSES_H on Solaris since the configure script is broken 89# Force HAVE_CURSES_H on Solaris since the configure script is broken
96# and does not properly detect this, breaking the build later on. Also 90# and does not properly detect this, breaking the build later on. Also
@@ -122,13 +116,14 @@ SUBST_NOOP_OK.scr= yes # since RCD_SCRIP @@ -122,13 +116,14 @@ SUBST_NOOP_OK.scr= yes # since RCD_SCRIP
122.if ${OPSYS} == "NetBSD" 116.if ${OPSYS} == "NetBSD"
123USE_BUILTIN.editline= no 117USE_BUILTIN.editline= no
124.endif 118.endif
125 119
126CHECK_PORTABILITY_SKIP+= packaging/deb-in/mysql-packagesource-server.config.in 120CHECK_PORTABILITY_SKIP+= packaging/deb-in/mysql-packagesource-server.config.in
127 121
128.include "../../archivers/lz4/buildlink3.mk" 122.include "../../archivers/lz4/buildlink3.mk"
129.include "../../devel/boost-libs/buildlink3.mk" 123.include "../../devel/boost-libs/buildlink3.mk"
130.include "../../devel/editline/buildlink3.mk" 124.include "../../devel/editline/buildlink3.mk"
131.include "../../devel/libevent/buildlink3.mk" 125.include "../../devel/libevent/buildlink3.mk"
132.include "../../devel/zlib/buildlink3.mk" 126.include "../../devel/zlib/buildlink3.mk"
133.include "../../security/openssl/buildlink3.mk" 127.include "../../security/openssl/buildlink3.mk"
134.include "../../mk/curses.buildlink3.mk" 128.include "../../mk/curses.buildlink3.mk"
 129.include "../../mk/atomic64.mk"
File Deleted: pkgsrc/databases/mysql57-client/Attic/hacks.mk
File Deleted: pkgsrc/databases/mysql57-server/Attic/hacks.mk
cvs diff -r1.62 -r1.63 pkgsrc/databases/redis/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/redis/Makefile 2020/10/27 10:22:34 1.62
+++ pkgsrc/databases/redis/Makefile 2020/12/31 20:04:11 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.62 2020/10/27 10:22:34 adam Exp $ 1# $NetBSD: Makefile,v 1.63 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= redis-6.0.9 3DISTNAME= redis-6.0.9
4CATEGORIES= databases 4CATEGORIES= databases
5MASTER_SITES= http://download.redis.io/releases/ 5MASTER_SITES= http://download.redis.io/releases/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://redis.io/ 8HOMEPAGE= https://redis.io/
9COMMENT= Persistent key-value database with built-in net interface 9COMMENT= Persistent key-value database with built-in net interface
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12TEST_DEPENDS+= tcl>=8.5:../../lang/tcl 12TEST_DEPENDS+= tcl>=8.5:../../lang/tcl
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
@@ -50,29 +50,25 @@ FILES_SUBST+= REDIS_GROUP=${REDIS_GROUP @@ -50,29 +50,25 @@ FILES_SUBST+= REDIS_GROUP=${REDIS_GROUP
50FILES_SUBST+= REDIS_DATADIR=${REDIS_DATADIR} 50FILES_SUBST+= REDIS_DATADIR=${REDIS_DATADIR}
51 51
52SUBST_CLASSES+= fix-paths 52SUBST_CLASSES+= fix-paths
53SUBST_STAGE.fix-paths= pre-configure 53SUBST_STAGE.fix-paths= pre-configure
54SUBST_MESSAGE.fix-paths= Fixing paths. 54SUBST_MESSAGE.fix-paths= Fixing paths.
55SUBST_FILES.fix-paths= redis.conf 55SUBST_FILES.fix-paths= redis.conf
56SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR 56SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR
57 57
58CHECK_PORTABILITY_SKIP+= deps/jemalloc/configure 58CHECK_PORTABILITY_SKIP+= deps/jemalloc/configure
59 59
60post-extract: 60post-extract:
61 ${CHMOD} -R g-w ${WRKSRC} 61 ${CHMOD} -R g-w ${WRKSRC}
62 62
63.if ${MACHINE_ARCH} == "i386" 
64# Need 8 byte atomics. 
65CFLAGS+= -march=i586 
66.endif 
67 
68post-install: 63post-install:
69 ${INSTALL_DATA} ${WRKSRC}/redis.conf ${DESTDIR}${EGDIR}/redis.conf.example 64 ${INSTALL_DATA} ${WRKSRC}/redis.conf ${DESTDIR}${EGDIR}/redis.conf.example
70.for file in ${DOCFILES} 65.for file in ${DOCFILES}
71 ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/${DOCDIR}/${file} 66 ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/${DOCDIR}/${file}
72.endfor 67.endfor
73 68
74do-test: 69do-test:
75 cd ${WRKSRC} && ${SH} runtest 70 cd ${WRKSRC} && ${SH} runtest
76 71
77.include "../../mk/pthread.buildlink3.mk" 72.include "../../mk/pthread.buildlink3.mk"
 73.include "../../mk/atomic64.mk"
78.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/devel/protobuf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/protobuf/Makefile 2020/11/14 14:07:40 1.35
+++ pkgsrc/devel/protobuf/Makefile 2020/12/31 20:04:11 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2020/11/14 14:07:40 adam Exp $ 1# $NetBSD: Makefile,v 1.36 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= protobuf-cpp-3.14.0 3DISTNAME= protobuf-cpp-3.14.0
4PKGNAME= ${DISTNAME:S/-cpp//} 4PKGNAME= ${DISTNAME:S/-cpp//}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=protocolbuffers/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=protocolbuffers/}
7GITHUB_PROJECT= protobuf 7GITHUB_PROJECT= protobuf
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/protocolbuffers/protobuf 11HOMEPAGE= https://github.com/protocolbuffers/protobuf
12COMMENT= Google protocol buffers 12COMMENT= Google protocol buffers
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -19,27 +19,23 @@ USE_LIBTOOL= yes @@ -19,27 +19,23 @@ USE_LIBTOOL= yes
19USE_TOOLS+= gmake 19USE_TOOLS+= gmake
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in 21PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in
22PKGCONFIG_OVERRIDE+= protobuf.pc.in 22PKGCONFIG_OVERRIDE+= protobuf.pc.in
23TEST_TARGET= check 23TEST_TARGET= check
24 24
25# false positive: the Makefile generates bash programs 25# false positive: the Makefile generates bash programs
26CHECK_PORTABILITY_SKIP= benchmarks/Makefile.in 26CHECK_PORTABILITY_SKIP= benchmarks/Makefile.in
27# the [[ command will skip a test that would otherwise run 27# the [[ command will skip a test that would otherwise run
28CHECK_PORTABILITY_SKIP+= src/google/protobuf/compiler/zip_output_unittest.sh 28CHECK_PORTABILITY_SKIP+= src/google/protobuf/compiler/zip_output_unittest.sh
29 29
30SET_LIBDIR= yes 30SET_LIBDIR= yes
31 31
32.if ${MACHINE_ARCH} == "i386" 
33# 64 bit atomic ops are required 
34CXXFLAGS+= -march=i586 
35.endif 
36 
37# configure: error: *** A compiler with support for C++11 language features is required. 32# configure: error: *** A compiler with support for C++11 language features is required.
38GCC_REQD+= 4.8 33GCC_REQD+= 4.8
39 34
40# included in third_party 35# included in third_party
41#.include "../../devel/googletest/buildlink3.mk" 36#.include "../../devel/googletest/buildlink3.mk"
42BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4 37BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4
43.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
44.include "../../mk/pthread.buildlink3.mk" 39.include "../../mk/pthread.buildlink3.mk"
 40.include "../../mk/atomic64.mk"
45.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/devel/protobuf/Attic/hacks.mk
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-parallel-n64/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-parallel-n64/Makefile 2020/11/13 16:15:54 1.2
+++ pkgsrc/emulators/libretro-parallel-n64/Makefile 2020/12/31 20:04:11 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2020/11/13 16:15:54 nia Exp $ 1# $NetBSD: Makefile,v 1.3 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= libretro-parallel-n64-20200528 3DISTNAME= libretro-parallel-n64-20200528
4CATEGORIES= emulators 4CATEGORIES= emulators
5GITHUB_PROJECT= parallel-n64 5GITHUB_PROJECT= parallel-n64
6GITHUB_TAG= 9dd669e2f63b320c5942f2fe0b2df275dba99393 6GITHUB_TAG= 9dd669e2f63b320c5942f2fe0b2df275dba99393
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/libretro/parallel-n64 9HOMEPAGE= https://github.com/libretro/parallel-n64
10COMMENT= Libretro core based on the Parallel N64 emulator 10COMMENT= Libretro core based on the Parallel N64 emulator
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14LIBRETRO_CORE= parallel_n64 14LIBRETRO_CORE= parallel_n64
@@ -26,22 +26,19 @@ CFLAGS+= -DNO_ASM -DARM_FIX @@ -26,22 +26,19 @@ CFLAGS+= -DNO_ASM -DARM_FIX
26.elif ${MACHINE_ARCH} == "earmv7hf" 26.elif ${MACHINE_ARCH} == "earmv7hf"
27MAKE_FLAGS+= WITH_DYNAREC=arm 27MAKE_FLAGS+= WITH_DYNAREC=arm
28MAKE_FLAGS+= HAVE_NEON=1 28MAKE_FLAGS+= HAVE_NEON=1
29CFLAGS+= -DNO_ASM -DARM_FIX 29CFLAGS+= -DNO_ASM -DARM_FIX
30.elif !empty(MACHINE_ARCH:M*arm*) 30.elif !empty(MACHINE_ARCH:M*arm*)
31MAKE_FLAGS+= WITH_DYNAREC=arm 31MAKE_FLAGS+= WITH_DYNAREC=arm
32MAKE_FLAGS+= HAVE_NEON=0 32MAKE_FLAGS+= HAVE_NEON=0
33CFLAGS+= -DNO_ASM -DARM_FIX 33CFLAGS+= -DNO_ASM -DARM_FIX
34.else 34.else
35MAKE_FLAGS+= WITH_DYNAREC= 35MAKE_FLAGS+= WITH_DYNAREC=
36CFLAGS+= -DNO_ASM 36CFLAGS+= -DNO_ASM
37.endif 37.endif
38 38
39.if ${MACHINE_ARCH} == "powerpc" 
40.include "../../devel/libatomic/buildlink3.mk" 
41.endif 
42 
43BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./libretro/link.T 39BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./libretro/link.T
44 40
45.include "options.mk" 41.include "options.mk"
46.include "../../emulators/retroarch/core.mk" 42.include "../../emulators/retroarch/core.mk"
 43.include "../../mk/atomic64.mk"
47.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.50 -r1.51 pkgsrc/games/lgogdownloader/Makefile (expand / switch to unified diff)

--- pkgsrc/games/lgogdownloader/Makefile 2020/05/22 10:56:08 1.50
+++ pkgsrc/games/lgogdownloader/Makefile 2020/12/31 20:04:11 1.51
@@ -1,35 +1,29 @@ @@ -1,35 +1,29 @@
1# $NetBSD: Makefile,v 1.50 2020/05/22 10:56:08 adam Exp $ 1# $NetBSD: Makefile,v 1.51 2020/12/31 20:04:11 nia Exp $
2 2
3DISTNAME= lgogdownloader-3.7 3DISTNAME= lgogdownloader-3.7
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Sude-/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Sude-/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/Sude-/lgogdownloader 10HOMEPAGE= https://github.com/Sude-/lgogdownloader
11COMMENT= Download games from GOG 11COMMENT= Download games from GOG
12LICENSE= public-domain # actually, dwtfywtpl 12LICENSE= public-domain # actually, dwtfywtpl
13 13
14TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man 14TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20.include "../../mk/bsd.prefs.mk" 
21 
22.if ${MACHINE_ARCH} == "i386" 
23# 64 bit atomic ops are required 
24CXXFLAGS+= -march=i586 
25.endif 
26 
27CMAKE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json 20CMAKE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json
28 21
29.include "../../devel/boost-libs/buildlink3.mk" 22.include "../../devel/boost-libs/buildlink3.mk"
30.include "../../textproc/tinyxml2/buildlink3.mk" 23.include "../../textproc/tinyxml2/buildlink3.mk"
31.include "../../www/htmlcxx/buildlink3.mk" 24.include "../../www/htmlcxx/buildlink3.mk"
32.include "../../www/curl/buildlink3.mk" 25.include "../../www/curl/buildlink3.mk"
33.include "../../misc/rhash/buildlink3.mk" 26.include "../../misc/rhash/buildlink3.mk"
34.include "../../textproc/jsoncpp/buildlink3.mk" 27.include "../../textproc/jsoncpp/buildlink3.mk"
 28.include "../../mk/atomic64.mk"
35.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/games/supertuxkart/Makefile (expand / switch to unified diff)

--- pkgsrc/games/supertuxkart/Makefile 2020/05/22 10:56:10 1.37
+++ pkgsrc/games/supertuxkart/Makefile 2020/12/31 20:04:12 1.38
@@ -1,59 +1,46 @@ @@ -1,59 +1,46 @@
1# $NetBSD: Makefile,v 1.37 2020/05/22 10:56:10 adam Exp $ 1# $NetBSD: Makefile,v 1.38 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= supertuxkart-1.1-src 3DISTNAME= supertuxkart-1.1-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=supertuxkart/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=supertuxkart/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://supertuxkart.net/Main_Page 11HOMEPAGE= https://supertuxkart.net/Main_Page
12COMMENT= Free 3D kart racing game 12COMMENT= Free 3D kart racing game
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= cmake pkg-config 17USE_TOOLS+= cmake pkg-config
18 18
19CMAKE_ARGS+= -DUSE_WIIUSE=OFF 19CMAKE_ARGS+= -DUSE_WIIUSE=OFF
20CMAKE_ARGS+= -DBUILD_RECORDER=OFF 20CMAKE_ARGS+= -DBUILD_RECORDER=OFF
21 21
22# Needs linux joystick support. 22# Needs linux joystick support.
23CMAKE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF 23CMAKE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF
24 24
25.include "../../mk/bsd.prefs.mk" 
26 
27.if ${MACHINE_ARCH} == "i386" 
28# 64 bit atomic ops are required 
29CXXFLAGS+= -march=i586 
30.endif 
31 
32# lib/mcpp/eval.c: In function 'eval_if': 
33# lib/mcpp/eval.c:361:44: error: array subscript has type 'char' [-Werror=char-subscripts] 
34# , opname[ op], prec, opname[ opp->op], opp->prec, opp->skip); 
35# ^ 
36# Maybe fix this later. 
37BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts 
38 
39.include "../../archivers/bzip2/buildlink3.mk" 25.include "../../archivers/bzip2/buildlink3.mk"
40.include "../../audio/libvorbis/buildlink3.mk" 26.include "../../audio/libvorbis/buildlink3.mk"
41.include "../../audio/openal-soft/buildlink3.mk" 27.include "../../audio/openal-soft/buildlink3.mk"
42.include "../../converters/fribidi/buildlink3.mk" 28.include "../../converters/fribidi/buildlink3.mk"
43.include "../../fonts/harfbuzz/buildlink3.mk" 29.include "../../fonts/harfbuzz/buildlink3.mk"
44.include "../../graphics/freetype2/buildlink3.mk" 30.include "../../graphics/freetype2/buildlink3.mk"
45.include "../../graphics/glew/buildlink3.mk" 31.include "../../graphics/glew/buildlink3.mk"
46.include "../../graphics/glu/buildlink3.mk" 32.include "../../graphics/glu/buildlink3.mk"
47.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
48.include "../../graphics/MesaLib/buildlink3.mk" 34.include "../../graphics/MesaLib/buildlink3.mk"
49.include "../../graphics/png/buildlink3.mk" 35.include "../../graphics/png/buildlink3.mk"
50.include "../../net/enet/buildlink3.mk" 36.include "../../net/enet/buildlink3.mk"
51.include "../../security/nettle/buildlink3.mk" 37.include "../../security/nettle/buildlink3.mk"
52.include "../../www/curl/buildlink3.mk" 38.include "../../www/curl/buildlink3.mk"
53.if ${OPSYS} != "Darwin" 39.if ${OPSYS} != "Darwin"
54. include "../../x11/libX11/buildlink3.mk" 40. include "../../x11/libX11/buildlink3.mk"
55. include "../../x11/libXrandr/buildlink3.mk" 41. include "../../x11/libXrandr/buildlink3.mk"
56.endif 42.endif
57.include "../../mk/jpeg.buildlink3.mk" 43.include "../../mk/jpeg.buildlink3.mk"
58.include "../../mk/pthread.buildlink3.mk" 44.include "../../mk/pthread.buildlink3.mk"
 45.include "../../mk/atomic64.mk"
59.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.222 -r1.223 pkgsrc/graphics/inkscape/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/Makefile 2020/12/26 17:02:37 1.222
+++ pkgsrc/graphics/inkscape/Makefile 2020/12/31 20:04:12 1.223
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.222 2020/12/26 17:02:37 nia Exp $ 1# $NetBSD: Makefile,v 1.223 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= inkscape-1.0.1 3DISTNAME= inkscape-1.0.1
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://media.inkscape.org/dl/resources/file/ 6MASTER_SITES= https://media.inkscape.org/dl/resources/file/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= https://www.inkscape.org/ 10HOMEPAGE= https://www.inkscape.org/
11COMMENT= Scalable Vector Graphics (SVG) editor 11COMMENT= Scalable Vector Graphics (SVG) editor
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14WRKSRC= ${WRKDIR}/inkscape-1.0.1_2020-09-07_3bc2e813f5 14WRKSRC= ${WRKDIR}/inkscape-1.0.1_2020-09-07_3bc2e813f5
@@ -65,35 +65,26 @@ CHECK_PORTABILITY_SKIP+= packaging/macos @@ -65,35 +65,26 @@ CHECK_PORTABILITY_SKIP+= packaging/macos
65CHECK_PORTABILITY_SKIP+= packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh 65CHECK_PORTABILITY_SKIP+= packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
66 66
67CMAKE_ARGS+= -DPACKAGE_LOCALE_DIR=${PREFIX}/${PKGLOCALEDIR}/locale 67CMAKE_ARGS+= -DPACKAGE_LOCALE_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
68 68
69MANCOMPRESSED= yes 69MANCOMPRESSED= yes
70 70
71.include "options.mk" 71.include "options.mk"
72 72
73.include "../../mk/bsd.prefs.mk" 73.include "../../mk/bsd.prefs.mk"
74.if ${OPSYS} == "Darwin" 74.if ${OPSYS} == "Darwin"
75CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include 75CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
76.endif 76.endif
77 77
78.if ${MACHINE_ARCH} == "i386" 
79CFLAGS+= -march=i586 
80CXXFLAGS+= -march=i586 
81.endif 
82 
83.if ${MACHINE_ARCH} == "powerpc" 
84. include "../../devel/libatomic/buildlink3.mk" 
85.endif 
86 
87# There exists some race condition in create_default_templates.py that 78# There exists some race condition in create_default_templates.py that
88# makes default.es_MX.svg sometimes not get installed. 79# makes default.es_MX.svg sometimes not get installed.
89# (gettext translation file dependency not correctly expressed in cmake?) 80# (gettext translation file dependency not correctly expressed in cmake?)
90# Run the script post-build to ensure all files are generated. 81# Run the script post-build to ensure all files are generated.
91post-build: 82post-build:
92 cd ${WRKSRC} && ${PYTHONBIN} ./share/templates/create_default_templates.py . . 83 cd ${WRKSRC} && ${PYTHONBIN} ./share/templates/create_default_templates.py . .
93 84
94BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4 85BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4
95.include "../../converters/libcdr/buildlink3.mk" 86.include "../../converters/libcdr/buildlink3.mk"
96.include "../../converters/librevenge/buildlink3.mk" 87.include "../../converters/librevenge/buildlink3.mk"
97.include "../../converters/libvisio/buildlink3.mk" 88.include "../../converters/libvisio/buildlink3.mk"
98.include "../../converters/libwpg/buildlink3.mk" 89.include "../../converters/libwpg/buildlink3.mk"
99.include "../../devel/boehm-gc/buildlink3.mk" 90.include "../../devel/boehm-gc/buildlink3.mk"
@@ -111,14 +102,15 @@ BUILDLINK_API_DEPENDS.boehm-gc+= boehm-g @@ -111,14 +102,15 @@ BUILDLINK_API_DEPENDS.boehm-gc+= boehm-g
111.include "../../math/double-conversion/buildlink3.mk" 102.include "../../math/double-conversion/buildlink3.mk"
112.include "../../net/libsoup/buildlink3.mk" 103.include "../../net/libsoup/buildlink3.mk"
113.include "../../print/poppler-glib/buildlink3.mk" 104.include "../../print/poppler-glib/buildlink3.mk"
114.include "../../print/poppler-includes/buildlink3.mk" 105.include "../../print/poppler-includes/buildlink3.mk"
115.include "../../textproc/aspell/buildlink3.mk" 106.include "../../textproc/aspell/buildlink3.mk"
116.include "../../textproc/gtkspell3/buildlink3.mk" 107.include "../../textproc/gtkspell3/buildlink3.mk"
117.include "../../textproc/libxml2/buildlink3.mk" 108.include "../../textproc/libxml2/buildlink3.mk"
118.include "../../textproc/libxslt/buildlink3.mk" 109.include "../../textproc/libxslt/buildlink3.mk"
119.include "../../x11/gtkmm3/buildlink3.mk" 110.include "../../x11/gtkmm3/buildlink3.mk"
120.include "../../x11/libXext/buildlink3.mk" 111.include "../../x11/libXext/buildlink3.mk"
121 112
122.include "../../sysutils/desktop-file-utils/desktopdb.mk" 113.include "../../sysutils/desktop-file-utils/desktopdb.mk"
123.include "../../lang/python/application.mk" 114.include "../../lang/python/application.mk"
 115.include "../../mk/atomic64.mk"
124.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/lang/mozjs78/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mozjs78/Makefile 2020/12/30 06:10:37 1.15
+++ pkgsrc/lang/mozjs78/Makefile 2020/12/31 20:04:12 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2020/12/30 06:10:37 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.16 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= mozjs78_78.4.0.orig 3DISTNAME= mozjs78_78.4.0.orig
4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} 4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/ 6MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://mozilla-spidermonkey.github.io/ 10HOMEPAGE= https://mozilla-spidermonkey.github.io/
11COMMENT= SpiderMonkey JavaScript library (78.x branch) 11COMMENT= SpiderMonkey JavaScript library (78.x branch)
12LICENSE= mpl-1.1 12LICENSE= mpl-1.1
13 13
14WRKSRC= ${WRKDIR}/firefox-${PKGVERSION_NOREV} 14WRKSRC= ${WRKDIR}/firefox-${PKGVERSION_NOREV}
@@ -29,40 +29,26 @@ CONFIGURE_ARGS+= --with-system-icu @@ -29,40 +29,26 @@ CONFIGURE_ARGS+= --with-system-icu
29CONFIGURE_ARGS+= --with-system-zlib 29CONFIGURE_ARGS+= --with-system-zlib
30CONFIGURE_ARGS+= --enable-readline 30CONFIGURE_ARGS+= --enable-readline
31CONFIGURE_ARGS+= --disable-jemalloc 31CONFIGURE_ARGS+= --disable-jemalloc
32CONFIGURE_ARGS+= --disable-debug-symbols 32CONFIGURE_ARGS+= --disable-debug-symbols
33CONFIGURE_ARGS+= --enable-strip 33CONFIGURE_ARGS+= --enable-strip
34CONFIGURE_ARGS+= --with-intl-api 34CONFIGURE_ARGS+= --with-intl-api
35# --disable-optimize 35# --disable-optimize
36# For rustc/cargo detection 36# For rustc/cargo detection
37CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM} 37CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
38CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} 38CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
39 39
40BUILDLINK_TRANSFORM.SunOS+= rm:-pie 40BUILDLINK_TRANSFORM.SunOS+= rm:-pie
41 41
42.include "../../mk/bsd.prefs.mk" 
43 
44.if ${MACHINE_ARCH} == "i386" 
45# 64 bit atomics 
46CXXFLAGS+= -march=i586 
47.endif 
48 
49# XXX This does not work entirely correctly at present. There are 
50# 26 atomic type test failures on powerpc, where these pass on i386. 
51.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) 
52# 64 bit atomics 
53.include "../../devel/libatomic/buildlink3.mk" 
54.endif 
55 
56SUBST_CLASSES+= conf 42SUBST_CLASSES+= conf
57SUBST_STAGE.conf= pre-configure 43SUBST_STAGE.conf= pre-configure
58SUBST_MESSAGE.conf= Set variables in configuration file. 44SUBST_MESSAGE.conf= Set variables in configuration file.
59SUBST_FILES.conf+= js/moz.configure 45SUBST_FILES.conf+= js/moz.configure
60SUBST_VARS.conf= PREFIX 46SUBST_VARS.conf= PREFIX
61 47
62PKGCONFIG_OVERRIDE+= js/src/build/js.pc.in 48PKGCONFIG_OVERRIDE+= js/src/build/js.pc.in
63PKGCONFIG_OVERRIDE+= js/src/ctypes/libffi/libffi.pc.in 49PKGCONFIG_OVERRIDE+= js/src/ctypes/libffi/libffi.pc.in
64 50
65PYTHON_VERSIONS_INCOMPATIBLE= 27 51PYTHON_VERSIONS_INCOMPATIBLE= 27
66PYTHON_FOR_BUILD_ONLY= tool 52PYTHON_FOR_BUILD_ONLY= tool
67TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 53TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
68 54
@@ -83,14 +69,17 @@ post-install: @@ -83,14 +69,17 @@ post-install:
83 ${LN} -s libmozjs-78.so.0 libmozjs-78.so 69 ${LN} -s libmozjs-78.so.0 libmozjs-78.so
84 ${RM} -f ${DESTDIR}${PREFIX}/lib/libjs_static.ajs 70 ${RM} -f ${DESTDIR}${PREFIX}/lib/libjs_static.ajs
85 ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-78/js-config.h 71 ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-78/js-config.h
86 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-78.pc 72 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-78.pc
87 73
88BUILDLINK_DEPMETHOD.clang= build 74BUILDLINK_DEPMETHOD.clang= build
89.include "../../lang/clang/buildlink3.mk" 75.include "../../lang/clang/buildlink3.mk"
90RUST_REQ= 1.41.0 76RUST_REQ= 1.41.0
91.include "../../lang/rust/rust.mk" 77.include "../../lang/rust/rust.mk"
92.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
93.include "../../lang/python/tool.mk" 79.include "../../lang/python/tool.mk"
94.include "../../textproc/icu/buildlink3.mk" 80.include "../../textproc/icu/buildlink3.mk"
95.include "../../mk/readline.buildlink3.mk" 81.include "../../mk/readline.buildlink3.mk"
 82# XXX This does not work entirely correctly at present. There are
 83# 26 atomic type test failures on powerpc, where these pass on i386.
 84.include "../../mk/atomic64.mk"
96.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"
cvs diff -r1.204 -r1.205 pkgsrc/lang/nodejs/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/Makefile 2020/12/21 09:41:32 1.204
+++ pkgsrc/lang/nodejs/Makefile 2020/12/31 20:04:12 1.205
@@ -1,41 +1,40 @@ @@ -1,41 +1,40 @@
1# $NetBSD: Makefile,v 1.204 2020/12/21 09:41:32 adam Exp $ 1# $NetBSD: Makefile,v 1.205 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= node-v14.15.3 3DISTNAME= node-v14.15.3
4EXTRACT_SUFX= .tar.xz 4EXTRACT_SUFX= .tar.xz
5 5
6USE_LANGUAGES= c gnu++14 6USE_LANGUAGES= c gnu++14
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10# XXX: figure out a way to add rpaths to torque 10# XXX: figure out a way to add rpaths to torque
11MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 11MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
12 12
13CONFIGURE_ARGS+= --shared-nghttp2 13CONFIGURE_ARGS+= --shared-nghttp2
14CONFIGURE_ARGS+= --with-intl=system-icu 14CONFIGURE_ARGS+= --with-intl=system-icu
15 15
16PYTHON_VERSIONS_ACCEPTED= 27 16PYTHON_VERSIONS_ACCEPTED= 27
17 17
18CHECK_PORTABILITY_SKIP+= tools/macos-installer/pkgbuild/npm/scripts/preinstall 18CHECK_PORTABILITY_SKIP+= tools/macos-installer/pkgbuild/npm/scripts/preinstall
19 19
20.if ${MACHINE_ARCH} == "i386" 20.if ${MACHINE_ARCH} == "i386"
21# 64 bit atomic ops are required 
22CXXFLAGS+= -march=i586 
23# required for SSE2 code under i386. 21# required for SSE2 code under i386.
24CXXFLAGS+= -mstackrealign 22CXXFLAGS+= -mstackrealign
25.endif 23.endif
26 24
27.include "options.mk" 25.include "options.mk"
28 26
29# Node turns on -latomic for arm, mips and ppc. 27# Node turns on -latomic for arm, mips and ppc.
30.if !empty(MACHINE_ARCH:M*arm*) || \ 28.if !empty(MACHINE_ARCH:M*arm*) || \
31 !empty(MACHINE_ARCH:M*powerpc*) || \ 29 !empty(MACHINE_ARCH:M*powerpc*) || \
32 !empty(MACHINE_ARCH:M*mips*) 30 !empty(MACHINE_ARCH:M*mips*)
33.include "../../devel/libatomic/buildlink3.mk" 31.include "../../devel/libatomic/buildlink3.mk"
34.endif 32.endif
35 33
36.include "../../lang/nodejs/Makefile.common" 34.include "../../lang/nodejs/Makefile.common"
37.include "../../textproc/icu/buildlink3.mk" 35.include "../../textproc/icu/buildlink3.mk"
38# Requires nghttp2_option_set_max_settings 36# Requires nghttp2_option_set_max_settings
39BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 37BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
40.include "../../www/nghttp2/buildlink3.mk" 38.include "../../www/nghttp2/buildlink3.mk"
 39.include "../../mk/atomic64.mk"
41.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.26 -r1.27 pkgsrc/lang/nodejs12/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nodejs12/Attic/Makefile 2020/12/16 07:42:39 1.26
+++ pkgsrc/lang/nodejs12/Attic/Makefile 2020/12/31 20:04:12 1.27
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.26 2020/12/16 07:42:39 adam Exp $ 1# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= node-v12.20.0 3DISTNAME= node-v12.20.0
4 4
5USE_LANGUAGES= c gnu++14 5USE_LANGUAGES= c gnu++14
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# XXX: figure out a way to add rpaths to torque 9# XXX: figure out a way to add rpaths to torque
10MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib 10MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib
11 11
12CONFIGURE_ARGS+= --shared-nghttp2 12CONFIGURE_ARGS+= --shared-nghttp2
13CONFIGURE_ARGS+= --with-intl=system-icu 13CONFIGURE_ARGS+= --with-intl=system-icu
14 14
15PYTHON_VERSIONS_ACCEPTED= 27 15PYTHON_VERSIONS_ACCEPTED= 27
16 16
17CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh 17CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh
18CHECK_PORTABILITY_SKIP+= tools/macos-installer/* 18CHECK_PORTABILITY_SKIP+= tools/macos-installer/*
19 19
20.if ${MACHINE_ARCH} == "i386" 20.if ${MACHINE_ARCH} == "i386"
21# 64 bit atomic ops are required 
22CXXFLAGS+= -march=i586 
23# required for SSE2 code under i386. 21# required for SSE2 code under i386.
24CXXFLAGS+= -mstackrealign 22CXXFLAGS+= -mstackrealign
25.endif 23.endif
26 24
27.include "../../lang/nodejs/options.mk" 25.include "../../lang/nodejs/options.mk"
28 26
29.include "../../lang/nodejs/Makefile.common" 27.include "../../lang/nodejs/Makefile.common"
30.include "../../textproc/icu/buildlink3.mk" 28.include "../../textproc/icu/buildlink3.mk"
31# Requires nghttp2_option_set_max_settings 29# Requires nghttp2_option_set_max_settings
32BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 30BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
33.include "../../www/nghttp2/buildlink3.mk" 31.include "../../www/nghttp2/buildlink3.mk"
 32.include "../../mk/atomic64.mk"
34.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.247 -r1.248 pkgsrc/misc/libreoffice/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/Makefile 2020/12/04 20:45:30 1.247
+++ pkgsrc/misc/libreoffice/Makefile 2020/12/31 20:04:12 1.248
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.247 2020/12/04 20:45:30 nia Exp $ 1# $NetBSD: Makefile,v 1.248 2020/12/31 20:04:12 nia Exp $
2 2
3VERREL= 7.0.3 3VERREL= 7.0.3
4VERRC= 1 4VERRC= 1
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGREVISION= 5 7PKGREVISION= 5
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.libreoffice.org/ 13HOMEPAGE= https://www.libreoffice.org/
14COMMENT= Office productivity suite from The Document Foundation 14COMMENT= Office productivity suite from The Document Foundation
@@ -252,31 +252,26 @@ CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh @@ -252,31 +252,26 @@ CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
252#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program 252#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
253 253
254MAKE_ENV+= ROOT_USER=${ROOT_USER} 254MAKE_ENV+= ROOT_USER=${ROOT_USER}
255MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} 255MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
256MAKE_ENV+= SHELL=${BASH} 256MAKE_ENV+= SHELL=${BASH}
257#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 257#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
258BUILD_MAKE_FLAGS+= VERBOSE=true 258BUILD_MAKE_FLAGS+= VERBOSE=true
259#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p 259#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p
260 260
261.if ${OPSYS} != "Linux" 261.if ${OPSYS} != "Linux"
262BUILDLINK_TRANSFORM+= rm:-ldl 262BUILDLINK_TRANSFORM+= rm:-ldl
263.endif 263.endif
264 264
265.if ${MACHINE_ARCH} == "i386" 
266# For 64 bit atomic ops (PR/54826) 
267CXXFLAGS+= -march=i586 
268.endif 
269 
270INSTALLATION_DIRS= bin share/applications 265INSTALLATION_DIRS= bin share/applications
271 266
272.PHONY: debugrun 267.PHONY: debugrun
273# For debugging 268# For debugging
274debugrun: 269debugrun:
275 cd ${WRKSRC} && gmake debugrun 270 cd ${WRKSRC} && gmake debugrun
276 271
277post-extract: 272post-extract:
278 ${MKDIR} -p ${WRKSRC}/src 273 ${MKDIR} -p ${WRKSRC}/src
279.for md in ${MORE_DISTFILES} ${MORE_DISTFILES2} 274.for md in ${MORE_DISTFILES} ${MORE_DISTFILES2}
280 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md} 275 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
281.endfor 276.endfor
282 mkdir ${WRKSRC}/tmp 277 mkdir ${WRKSRC}/tmp
@@ -409,15 +404,15 @@ BUILDLINK_API_DEPENDS.libodfgen+=  @@ -409,15 +404,15 @@ BUILDLINK_API_DEPENDS.libodfgen+=
409.include "../../x11/libXcursor/buildlink3.mk" 404.include "../../x11/libXcursor/buildlink3.mk"
410.include "../../x11/libXext/buildlink3.mk" 405.include "../../x11/libXext/buildlink3.mk"
411.include "../../x11/libXfixes/buildlink3.mk" 406.include "../../x11/libXfixes/buildlink3.mk"
412.include "../../x11/libXi/buildlink3.mk" 407.include "../../x11/libXi/buildlink3.mk"
413.include "../../x11/libXinerama/buildlink3.mk" 408.include "../../x11/libXinerama/buildlink3.mk"
414.include "../../x11/libXrandr/buildlink3.mk" 409.include "../../x11/libXrandr/buildlink3.mk"
415.include "../../x11/libXrender/buildlink3.mk" 410.include "../../x11/libXrender/buildlink3.mk"
416.include "../../x11/libXt/buildlink3.mk" 411.include "../../x11/libXt/buildlink3.mk"
417.include "../../x11/pixman/buildlink3.mk" 412.include "../../x11/pixman/buildlink3.mk"
418.include "../../mk/dlopen.buildlink3.mk" 413.include "../../mk/dlopen.buildlink3.mk"
419.include "../../mk/pthread.buildlink3.mk" 414.include "../../mk/pthread.buildlink3.mk"
420.include "../../graphics/gnome-icon-theme/buildlink3.mk" 415.include "../../graphics/gnome-icon-theme/buildlink3.mk"
421.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 416.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
422 417.include "../../mk/atomic64.mk"
423.include "../../mk/bsd.pkg.mk" 418.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/mk/atomic64.mk
# $NetBSD: atomic64.mk,v 1.1 2020/12/31 20:04:12 nia Exp $
#
# This Makefile fragment is included by packages that require 64-bit atomic
# operations, and will attempt to set the appropriate architecture-specific
# compiler flags.

.if !defined(ATOMIC64_MK)

ATOMIC64_MK:=

.include "../../bsd.fast.prefs.mk"

.if ${MACHINE_ARCH} == "i386"
.  if empty(CFLAGS:M*march=*)
CFLAGS+=	-march=i586
CXXFLAGS+=	-march=i586
.  endif
.endif

.if ${MACHINE_ARCH} == "powerpc"
.  include "../../devel/libatomic/buildlink3.mk"
.endif

.endif
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/lightspark/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/lightspark/Makefile 2020/12/03 22:23:33 1.14
+++ pkgsrc/multimedia/lightspark/Makefile 2020/12/31 20:04:12 1.15
@@ -1,51 +1,46 @@ @@ -1,51 +1,46 @@
1# $NetBSD: Makefile,v 1.14 2020/12/03 22:23:33 nia Exp $ 1# $NetBSD: Makefile,v 1.15 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= lightspark-0.8.3 3DISTNAME= lightspark-0.8.3
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=lightspark/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=lightspark/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://lightspark.github.io/ 8HOMEPAGE= https://lightspark.github.io/
9COMMENT= Open source Flash player 9COMMENT= Open source Flash player
10LICENSE= gnu-lgpl-v3 10LICENSE= gnu-lgpl-v3
11 11
12USE_CMAKE= yes 12USE_CMAKE= yes
13USE_TOOLS+= pkg-config msgfmt msgmerge 13USE_TOOLS+= pkg-config msgfmt msgmerge
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16CMAKE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR} 16CMAKE_ARGS+= -DMANUAL_DIRECTORY=${PKGMANDIR}
17CMAKE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR} 17CMAKE_ARGS+= -DETCDIR=${PKG_SYSCONFDIR}
18 18
19TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm 19TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm
20 20
21# MESSAGE(FATAL_ERROR "GCC 4.6+ is required.") 21# MESSAGE(FATAL_ERROR "GCC 4.6+ is required.")
22GCC_REQD+= 4.6 22GCC_REQD+= 4.6
23 23
24CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \ 24CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \
25 ${PKG_SYSCONFDIR}/xdg/lightspark.conf 25 ${PKG_SYSCONFDIR}/xdg/lightspark.conf
26 26
27.include "../../mk/bsd.prefs.mk" 
28 
29.if ${MACHINE_ARCH} == "powerpc" 
30.include "../../devel/libatomic/buildlink3.mk" 
31.endif 
32 
33.include "../../archivers/xz/buildlink3.mk" 27.include "../../archivers/xz/buildlink3.mk"
34.include "../../audio/SDL2_mixer/buildlink3.mk" 28.include "../../audio/SDL2_mixer/buildlink3.mk"
35.include "../../devel/gettext-lib/buildlink3.mk" 29.include "../../devel/gettext-lib/buildlink3.mk"
36.include "../../devel/glibmm/buildlink3.mk" 30.include "../../devel/glibmm/buildlink3.mk"
37.include "../../devel/pango/buildlink3.mk" 31.include "../../devel/pango/buildlink3.mk"
38.include "../../devel/pcre/buildlink3.mk" 32.include "../../devel/pcre/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 33.include "../../devel/zlib/buildlink3.mk"
40.include "../../devel/SDL2/buildlink3.mk" 34.include "../../devel/SDL2/buildlink3.mk"
41.include "../../graphics/MesaLib/buildlink3.mk" 35.include "../../graphics/MesaLib/buildlink3.mk"
42.include "../../graphics/cairo/buildlink3.mk" 36.include "../../graphics/cairo/buildlink3.mk"
43.include "../../graphics/freetype2/buildlink3.mk" 37.include "../../graphics/freetype2/buildlink3.mk"
44.include "../../graphics/glew/buildlink3.mk" 38.include "../../graphics/glew/buildlink3.mk"
45.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 39.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
46.include "../../multimedia/ffmpeg4/buildlink3.mk" 40.include "../../multimedia/ffmpeg4/buildlink3.mk"
47.include "../../net/rtmpdump/buildlink3.mk" 41.include "../../net/rtmpdump/buildlink3.mk"
48.include "../../x11/libXext/buildlink3.mk" 42.include "../../x11/libXext/buildlink3.mk"
49.include "../../www/curl/buildlink3.mk" 43.include "../../www/curl/buildlink3.mk"
50.include "../../mk/jpeg.buildlink3.mk" 44.include "../../mk/jpeg.buildlink3.mk"
 45.include "../../mk/atomic64.mk"
51.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.119 -r1.120 pkgsrc/multimedia/mpv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2020/12/24 09:28:14 1.119
+++ pkgsrc/multimedia/mpv/Makefile 2020/12/31 20:04:12 1.120
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.119 2020/12/24 09:28:14 nia Exp $ 1# $NetBSD: Makefile,v 1.120 2020/12/31 20:04:12 nia Exp $
2 2
3DISTNAME= mpv-0.33.0 3DISTNAME= mpv-0.33.0
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= leot@NetBSD.org 8MAINTAINER= leot@NetBSD.org
9HOMEPAGE= https://mpv.io/ 9HOMEPAGE= https://mpv.io/
10COMMENT= Video player based on MPlayer and mplayer2 10COMMENT= Video player based on MPlayer and mplayer2
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
12 12
13# needs sem_timedwait(3) 13# needs sem_timedwait(3)
14NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 14NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
@@ -49,41 +49,30 @@ SUBST_MESSAGE.python= Fix Python command @@ -49,41 +49,30 @@ SUBST_MESSAGE.python= Fix Python command
49# 49#
50# On newer macOS releases there are a couple of swift compat static libraries 50# On newer macOS releases there are a couple of swift compat static libraries
51# that need to be added to the search path. 51# that need to be added to the search path.
52# 52#
53.if ${OPSYS} == "Darwin" 53.if ${OPSYS} == "Darwin"
54XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE} 54XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE}
55. if exists(${XCODE_DIR}/usr/lib/swift/macosx) 55. if exists(${XCODE_DIR}/usr/lib/swift/macosx)
56BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx 56BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx
57. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx) 57. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx)
58BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx 58BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx
59. endif 59. endif
60.endif 60.endif
61 61
62# 64-bit atomic operations 
63# https://mail-index.netbsd.org/pkgsrc-users/2020/12/23/msg032927.html 
64.if ${MACHINE_ARCH} == "i386" 
65CFLAGS+= -march=i586 
66CXXFLAGS+= -march=i586 
67.endif 
68 
69.if ${MACHINE_ARCH} == "powerpc" 
70.include "../../devel/libatomic/buildlink3.mk" 
71.endif 
72 
73post-install: 62post-install:
74 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv 63 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
75 64
76.include "options.mk" 65.include "options.mk"
77 
78.include "../../converters/libiconv/buildlink3.mk" 66.include "../../converters/libiconv/buildlink3.mk"
79.include "../../devel/waf/waf.mk" 67.include "../../devel/waf/waf.mk"
80.include "../../devel/zlib/buildlink3.mk" 68.include "../../devel/zlib/buildlink3.mk"
81.include "../../graphics/lcms2/buildlink3.mk" 69.include "../../graphics/lcms2/buildlink3.mk"
82.include "../../lang/python/application.mk" 70.include "../../lang/python/application.mk"
83.include "../../multimedia/libass/buildlink3.mk" 71.include "../../multimedia/libass/buildlink3.mk"
84.include "../../multimedia/libdvdnav/buildlink3.mk" 72.include "../../multimedia/libdvdnav/buildlink3.mk"
85.include "../../multimedia/ffmpeg4/buildlink3.mk" 73.include "../../multimedia/ffmpeg4/buildlink3.mk"
86.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 74.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
87.include "../../sysutils/desktop-file-utils/desktopdb.mk" 75.include "../../sysutils/desktop-file-utils/desktopdb.mk"
88.include "../../mk/jpeg.buildlink3.mk" 76.include "../../mk/jpeg.buildlink3.mk"
 77.include "../../mk/atomic64.mk"
89.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.132 -r1.133 pkgsrc/net/filezilla/Makefile (expand / switch to unified diff)

--- pkgsrc/net/filezilla/Makefile 2020/11/05 09:08:51 1.132
+++ pkgsrc/net/filezilla/Makefile 2020/12/31 20:04:13 1.133
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.132 2020/11/05 09:08:51 ryoon Exp $ 1# $NetBSD: Makefile,v 1.133 2020/12/31 20:04:13 nia Exp $
2 2
3VERSION= 3.50.0 3VERSION= 3.50.0
4DISTNAME= FileZilla_${VERSION}_src 4DISTNAME= FileZilla_${VERSION}_src
5PKGNAME= filezilla-${VERSION} 5PKGNAME= filezilla-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= net x11 7CATEGORIES= net x11
8MASTER_SITES= https://download.filezilla-project.org/client/ 8MASTER_SITES= https://download.filezilla-project.org/client/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://filezilla-project.org/ 12HOMEPAGE= https://filezilla-project.org/
13COMMENT= FTP, FTPS, and SFTP client with intuitive GUI 13COMMENT= FTP, FTPS, and SFTP client with intuitive GUI
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -18,32 +18,27 @@ USE_LANGUAGES= c c++17 @@ -18,32 +18,27 @@ USE_LANGUAGES= c c++17
18USE_TOOLS+= gmake pkg-config msgfmt msgmerge xgettext 18USE_TOOLS+= gmake pkg-config msgfmt msgmerge xgettext
19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
20 20
21CONFIGURE_ARGS+= --disable-autoupdatecheck 21CONFIGURE_ARGS+= --disable-autoupdatecheck
22# avoid xdg-utils dependency 22# avoid xdg-utils dependency
23CONFIGURE_ENV+= ac_cv_path_xdgopen=firefox 23CONFIGURE_ENV+= ac_cv_path_xdgopen=firefox
24 24
25GNU_CONFIGURE_WX_VERSION= no 25GNU_CONFIGURE_WX_VERSION= no
26 26
27# For C++17. 27# For C++17.
28GCC_REQD+= 7 28GCC_REQD+= 7
29 29
30.include "options.mk" 30.include "options.mk"
31 
32# As of 3.41, 64-bit atomic ops are required 
33.if ${MACHINE_ARCH} == "i386" 
34CXXFLAGS+= -march=i586 
35.endif 
36 
37.include "../../databases/sqlite3/buildlink3.mk" 31.include "../../databases/sqlite3/buildlink3.mk"
38.include "../../devel/libidn/buildlink3.mk" 32.include "../../devel/libidn/buildlink3.mk"
39.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 33.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
40BUILDLINK_API_DEPENDS.libfilezilla+= libfilezilla>=0.24 34BUILDLINK_API_DEPENDS.libfilezilla+= libfilezilla>=0.24
41.include "../../net/libfilezilla/buildlink3.mk" 35.include "../../net/libfilezilla/buildlink3.mk"
42BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.4.0 36BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.4.0
43.include "../../security/gnutls/buildlink3.mk" 37.include "../../security/gnutls/buildlink3.mk"
44.include "../../sysutils/desktop-file-utils/desktopdb.mk" 38.include "../../sysutils/desktop-file-utils/desktopdb.mk"
45BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2nb1 39BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2nb1
46.include "../../textproc/pugixml/buildlink3.mk" 40.include "../../textproc/pugixml/buildlink3.mk"
47BUILDLINK_API_DEPENDS.wxGTK30+= wxGTK30>=3.0.4 41BUILDLINK_API_DEPENDS.wxGTK30+= wxGTK30>=3.0.4
48.include "../../x11/wxGTK30/buildlink3.mk" 42.include "../../x11/wxGTK30/buildlink3.mk"
 43.include "../../mk/atomic64.mk"
49.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.108 -r1.109 pkgsrc/net/freeradius/Makefile (expand / switch to unified diff)

--- pkgsrc/net/freeradius/Makefile 2020/08/31 18:10:33 1.108
+++ pkgsrc/net/freeradius/Makefile 2020/12/31 20:04:13 1.109
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.108 2020/08/31 18:10:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.109 2020/12/31 20:04:13 nia Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-server//} 5PKGNAME= ${DISTNAME:S/-server//}
6PKGREVISION= 2 6PKGREVISION= 2
7COMMENT= Free RADIUS server implementation 7COMMENT= Free RADIUS server implementation
8 8
9BUILD_DEFS+= VARBASE 9BUILD_DEFS+= VARBASE
10CONFIGURE_ARGS+= --localstatedir=${VARBASE} 10CONFIGURE_ARGS+= --localstatedir=${VARBASE}
11CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 11CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
12CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd 12CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/radiusd
13CONFIGURE_ARGS+= --without-rlm_eap_ikev2 13CONFIGURE_ARGS+= --without-rlm_eap_ikev2
14CONFIGURE_ARGS+= --without-rlm_eap_tnc 14CONFIGURE_ARGS+= --without-rlm_eap_tnc
@@ -211,14 +211,15 @@ CONF_FILES_PERMS+= ${EGDIR}/certs/bootst @@ -211,14 +211,15 @@ CONF_FILES_PERMS+= ${EGDIR}/certs/bootst
211.for d in ${EGDIRS} 211.for d in ${EGDIRS}
212OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${RADIUS_USER} ${RADIUS_GROUP} 0750 212OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${d} ${RADIUS_USER} ${RADIUS_GROUP} 0750
213.endfor 213.endfor
214 214
215INSTALL_MAKE_FLAGS+= raddbdir=${EGDIR} 215INSTALL_MAKE_FLAGS+= raddbdir=${EGDIR}
216 216
217TEST_TARGET= test 217TEST_TARGET= test
218TEST_MAKE_FLAGS+= EAPOL_TEST="" 218TEST_MAKE_FLAGS+= EAPOL_TEST=""
219 219
220post-install: 220post-install:
221 ${RM} -f ${DESTDIR}${PREFIX}/lib/*.a ${DESTDIR}${PREFIX}/lib/*.la 221 ${RM} -f ${DESTDIR}${PREFIX}/lib/*.a ${DESTDIR}${PREFIX}/lib/*.la
222 222
223.include "../../mk/pam.buildlink3.mk" 223.include "../../mk/pam.buildlink3.mk"
 224.include "../../mk/atomic64.mk"
224.include "../../mk/bsd.pkg.mk" 225.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/net/freeradius/Attic/hacks.mk
cvs diff -r1.1 -r1.2 pkgsrc/net/frr/Makefile (expand / switch to unified diff)

--- pkgsrc/net/frr/Makefile 2020/12/10 16:43:24 1.1
+++ pkgsrc/net/frr/Makefile 2020/12/31 20:04:13 1.2
@@ -1,44 +1,39 @@ @@ -1,44 +1,39 @@
1# $NetBSD: Makefile,v 1.1 2020/12/10 16:43:24 kardel Exp $ 1# $NetBSD: Makefile,v 1.2 2020/12/31 20:04:13 nia Exp $
2 2
3GITHUB_PROJECT= frr 3GITHUB_PROJECT= frr
4VERSION= 7.5 4VERSION= 7.5
5GITHUB_TAG= frr-${VERSION} 5GITHUB_TAG= frr-${VERSION}
6DISTNAME= frr-${VERSION} 6DISTNAME= frr-${VERSION}
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=FRRouting/}
9 9
10MAINTAINER= kardel@NetBSD.org 10MAINTAINER= kardel@NetBSD.org
11HOMEPAGE= https://github.com/FRRouting/frr/ 11HOMEPAGE= https://github.com/FRRouting/frr/
12COMMENT= Frr routing multi protocol suite 12COMMENT= Frr routing multi protocol suite
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS= quagga-[0-9]* 15CONFLICTS= quagga-[0-9]*
16 16
17WRKSRC= ${WRKDIR}/frr-frr-${VERSION} 17WRKSRC= ${WRKDIR}/frr-frr-${VERSION}
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf 19USE_TOOLS+= gmake perl bash pkg-config autoconf automake autoreconf
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22BUILD_DEFS= VARBASE 22BUILD_DEFS= VARBASE
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25.include "options.mk" 25.include "options.mk"
26 26
27# to pick up the atomic implementation on i386 
28.if ${MACHINE_ARCH} == "i386" 
29CPPFLAGS+= -march=i586 
30.endif 
31 
32FRR_GROUP?= _frr 27FRR_GROUP?= _frr
33FRR_VTY_GROUP?= frrvty 28FRR_VTY_GROUP?= frrvty
34 29
35FRR_USER?= _frr 30FRR_USER?= _frr
36FRR_CONF_MODE= 0640 31FRR_CONF_MODE= 0640
37FRR_CONFDIR_MODE= 0755 32FRR_CONFDIR_MODE= 0755
38FRR_LOG_MODE= 0640 33FRR_LOG_MODE= 0640
39 34
40PKG_SYSCONFDIR_PERMS= ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONFDIR_MODE} 35PKG_SYSCONFDIR_PERMS= ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONFDIR_MODE}
41PKG_SYSCONFSUBDIR= frr 36PKG_SYSCONFSUBDIR= frr
42 37
43PKG_GECOS.${FRR_USER}= FRRouting User 38PKG_GECOS.${FRR_USER}= FRRouting User
44PKG_HOME.${FRR_USER}= /nonexistent 39PKG_HOME.${FRR_USER}= /nonexistent
@@ -88,27 +83,27 @@ CONFIGURE_ARGS+= --enable-configfile-mas @@ -88,27 +83,27 @@ CONFIGURE_ARGS+= --enable-configfile-mas
88CONFIGURE_ARGS+= --enable-logfile-mask=${FRR_LOG_MODE} 83CONFIGURE_ARGS+= --enable-logfile-mask=${FRR_LOG_MODE}
89CONFIGURE_ARGS+= --enable-fpm 84CONFIGURE_ARGS+= --enable-fpm
90CONFIGURE_ARGS+= --with-pkg-git-version 85CONFIGURE_ARGS+= --with-pkg-git-version
91CONFIGURE_ARGS+= --with-pkg-extra-version=/${DISTNAME} 86CONFIGURE_ARGS+= --with-pkg-extra-version=/${DISTNAME}
92# CONFIGURE_ARGS+= --enable-address-sanitizer 87# CONFIGURE_ARGS+= --enable-address-sanitizer
93 88
94pre-configure: 89pre-configure:
95 cd ${WRKSRC} && ${SH} bootstrap.sh 90 cd ${WRKSRC} && ${SH} bootstrap.sh
96 91
97.include "../../devel/libyang/buildlink3.mk" 92.include "../../devel/libyang/buildlink3.mk"
98.include "../../textproc/json-c/buildlink3.mk" 93.include "../../textproc/json-c/buildlink3.mk"
99.include "../../lang/python/application.mk" 94.include "../../lang/python/application.mk"
100.include "../../devel/readline/buildlink3.mk" 95.include "../../devel/readline/buildlink3.mk"
101 96.include "../../mk/atomic64.mk"
102.include "../../mk/bsd.pkg.mk" 97.include "../../mk/bsd.pkg.mk"
103 98
104# needs to be here to have ${EGREP} defined 99# needs to be here to have ${EGREP} defined
105CONFIG_TEMPLATES!= ${EGREP} ${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null 100CONFIG_TEMPLATES!= ${EGREP} ${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null
106CONF_FILES?= 101CONF_FILES?=
107 102
108.for l in ${CONFIG_TEMPLATES} 103.for l in ${CONFIG_TEMPLATES}
109. if ${l:C,^${CONFIG_TEMPLATE_PATH}/(.*)\.sample,\1,} == "vtysh.conf" 104. if ${l:C,^${CONFIG_TEMPLATE_PATH}/(.*)\.sample,\1,} == "vtysh.conf"
110CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \ 105CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \
111 ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONF_MODE} 106 ${FRR_USER} ${FRR_VTY_GROUP} ${FRR_CONF_MODE}
112. else 107. else
113CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \ 108CONF_FILES_PERMS+= /dev/null ${PKG_SYSCONFDIR}${l:C,^${CONFIG_TEMPLATE_PATH}(/.*)\.sample,\1,} \
114 ${FRR_USER} ${FRR_GROUP} ${FRR_CONF_MODE} 109 ${FRR_USER} ${FRR_GROUP} ${FRR_CONF_MODE}
cvs diff -r1.34 -r1.35 pkgsrc/net/grpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/grpc/Makefile 2020/12/06 10:50:11 1.34
+++ pkgsrc/net/grpc/Makefile 2020/12/31 20:04:13 1.35
@@ -1,46 +1,39 @@ @@ -1,46 +1,39 @@
1# $NetBSD: Makefile,v 1.34 2020/12/06 10:50:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.35 2020/12/31 20:04:13 nia Exp $
2 2
3DISTNAME= grpc-1.34.0 3DISTNAME= grpc-1.34.0
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= https://grpc.io/ 9HOMEPAGE= https://grpc.io/
10COMMENT= High performance, open-source universal RPC framework 10COMMENT= High performance, open-source universal RPC framework
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES+= c c++11 14USE_LANGUAGES+= c c++11
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
17CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON 17CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
18# use cmake's find_package() to locate a pre-installed dependency 18# use cmake's find_package() to locate a pre-installed dependency
19CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package 19CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package
20CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package 20CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package
21CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package 21CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package
22CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package 22CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package
23CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package 23CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package
24CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package 24CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
25CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package 25CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package
26CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package 26CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/atomic64.mk"
29 
30# 64 bit atomic ops are required 
31.if ${MACHINE_ARCH} == "i386" 
32CFLAGS+= -march=i586 
33CXXFLAGS+= -march=i586 
34.endif 
35 
36.include "../../benchmarks/google-benchmark/buildlink3.mk" 29.include "../../benchmarks/google-benchmark/buildlink3.mk"
37.include "../../devel/abseil/buildlink3.mk" 30.include "../../devel/abseil/buildlink3.mk"
38.include "../../devel/gflags/buildlink3.mk" 31.include "../../devel/gflags/buildlink3.mk"
39BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.5 32BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.5
40.include "../../devel/protobuf/buildlink3.mk" 33.include "../../devel/protobuf/buildlink3.mk"
41.include "../../devel/re2/buildlink3.mk" 34.include "../../devel/re2/buildlink3.mk"
42.include "../../devel/zlib/buildlink3.mk" 35.include "../../devel/zlib/buildlink3.mk"
43BUILDLINK_API_DEPENDS.libcares+= libcares>=1.15.0nb1 36BUILDLINK_API_DEPENDS.libcares+= libcares>=1.15.0nb1
44.include "../../net/libcares/buildlink3.mk" 37.include "../../net/libcares/buildlink3.mk"
45.include "../../security/openssl/buildlink3.mk" 38.include "../../security/openssl/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/print/qpdf/Makefile (expand / switch to unified diff)

--- pkgsrc/print/qpdf/Makefile 2020/10/30 15:13:31 1.40
+++ pkgsrc/print/qpdf/Makefile 2020/12/31 20:04:13 1.41
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.40 2020/10/30 15:13:31 ryoon Exp $ 1# $NetBSD: Makefile,v 1.41 2020/12/31 20:04:13 nia Exp $
2 2
3DISTNAME= qpdf-10.0.2 3DISTNAME= qpdf-10.0.2
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qpdf/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qpdf/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://qpdf.sourceforge.net/ 8HOMEPAGE= http://qpdf.sourceforge.net/
9COMMENT= Structural, content-preserving transformations on PDF files 9COMMENT= Structural, content-preserving transformations on PDF files
10LICENSE= apache-2.0 10LICENSE= apache-2.0
11 11
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= gmake pkg-config perl 14USE_TOOLS+= gmake pkg-config perl
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16PKGCONFIG_OVERRIDE+= libqpdf.pc.in 16PKGCONFIG_OVERRIDE+= libqpdf.pc.in
17 17
18.include "../../mk/jpeg.buildlink3.mk" 18.include "../../mk/jpeg.buildlink3.mk"
19.include "../../devel/pcre/buildlink3.mk" 19.include "../../devel/pcre/buildlink3.mk"
20.include "../../devel/zlib/buildlink3.mk" 20.include "../../devel/zlib/buildlink3.mk"
 21.include "../../mk/atomic64.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/print/qpdf/Attic/hacks.mk
cvs diff -r1.26 -r1.27 pkgsrc/sysutils/rsyslog/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/Makefile 2020/05/22 10:56:40 1.26
+++ pkgsrc/sysutils/rsyslog/Makefile 2020/12/31 20:04:13 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2020/05/22 10:56:40 adam Exp $ 1# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:13 nia Exp $
2# 2#
3 3
4BUILDLINK_DEPMETHOD.libestr= full 4BUILDLINK_DEPMETHOD.libestr= full
5BUILDLINK_DEPMETHOD.libuuid= full 5BUILDLINK_DEPMETHOD.libuuid= full
6 6
7PKGREVISION= 10 7PKGREVISION= 10
8.include "../../sysutils/rsyslog/Makefile.common" 8.include "../../sysutils/rsyslog/Makefile.common"
9 9
10COMMENT= The enhanced syslogd for Unix 10COMMENT= The enhanced syslogd for Unix
11 11
12CONFIGURE_ARGS+= --disable-testbench \ 12CONFIGURE_ARGS+= --disable-testbench \
13 --enable-diagtools --enable-usertools --enable-uuid \ 13 --enable-diagtools --enable-usertools --enable-uuid \
14 --enable-imdiag --enable-imfile --enable-impstats \ 14 --enable-imdiag --enable-imfile --enable-impstats \
@@ -22,31 +22,26 @@ CONFIGURE_ARGS+= --enable-imsolaris --di @@ -22,31 +22,26 @@ CONFIGURE_ARGS+= --enable-imsolaris --di
22# Explicitly disable epoll/inotify on illumos, provided for Linux compat only. 22# Explicitly disable epoll/inotify on illumos, provided for Linux compat only.
23CONFIGURE_ENV+= ac_cv_func_epoll_create=no 23CONFIGURE_ENV+= ac_cv_func_epoll_create=no
24CONFIGURE_ENV+= ac_cv_func_epoll_create1=no 24CONFIGURE_ENV+= ac_cv_func_epoll_create1=no
25CONFIGURE_ENV+= ac_cv_func_inotify_init=no 25CONFIGURE_ENV+= ac_cv_func_inotify_init=no
26CONFIGURE_ENV+= ac_cv_header_sys_inotify_h=no 26CONFIGURE_ENV+= ac_cv_header_sys_inotify_h=no
27PLIST.solaris= yes 27PLIST.solaris= yes
28RSYSLOG_SYSMOD= imsolaris 28RSYSLOG_SYSMOD= imsolaris
29.else 29.else
30CONFIGURE_ARGS+= --disable-imsolaris --enable-klog 30CONFIGURE_ARGS+= --disable-imsolaris --enable-klog
31PLIST.klog= yes 31PLIST.klog= yes
32RSYSLOG_SYSMOD= imklog 32RSYSLOG_SYSMOD= imklog
33.endif 33.endif
34 34
35# needs to be able to do compare-and-swap on time_t (cmpxchg8b) 
36.if ${MACHINE_ARCH} == "i386" 
37CFLAGS+= -march=i586 
38.endif 
39 
40BUILDLINK_TRANSFORM.Darwin+= rm:-luuid 35BUILDLINK_TRANSFORM.Darwin+= rm:-luuid
41 36
42BUILD_DEFS+= VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR 37BUILD_DEFS+= VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR
43RSYSLOG_PIDDIR?= ${VARBASE}/run 38RSYSLOG_PIDDIR?= ${VARBASE}/run
44RSYSLOG_WRKDIR?= ${VARBASE}/lib/rsyslog 39RSYSLOG_WRKDIR?= ${VARBASE}/lib/rsyslog
45OWN_DIRS+= ${RSYSLOG_PIDDIR} ${RSYSLOG_WRKDIR} 40OWN_DIRS+= ${RSYSLOG_PIDDIR} ${RSYSLOG_WRKDIR}
46 41
47SUBST_CLASSES+= paths 42SUBST_CLASSES+= paths
48SUBST_STAGE.paths= pre-configure 43SUBST_STAGE.paths= pre-configure
49SUBST_FILES.paths= platform/redhat/rsyslog.conf tools/rsyslog.conf.5 44SUBST_FILES.paths= platform/redhat/rsyslog.conf tools/rsyslog.conf.5
50SUBST_FILES.paths+= tools/rsyslogd.8 tools/rsyslogd.c 45SUBST_FILES.paths+= tools/rsyslogd.8 tools/rsyslogd.c
51SUBST_VARS.paths= RSYSLOG_PIDDIR RSYSLOG_SYSMOD 46SUBST_VARS.paths= RSYSLOG_PIDDIR RSYSLOG_SYSMOD
52SUBST_SED.paths= -e "s|/etc|${PKG_SYSCONFDIR}|g" 47SUBST_SED.paths= -e "s|/etc|${PKG_SYSCONFDIR}|g"
@@ -60,14 +55,15 @@ SUBST_SED.ldargs= -e '/whole-archive.*li @@ -60,14 +55,15 @@ SUBST_SED.ldargs= -e '/whole-archive.*li
60 55
61RCD_SCRIPTS= rsyslogd 56RCD_SCRIPTS= rsyslogd
62 57
63CONF_FILES+= share/examples/rsyslog/rsyslog.conf \ 58CONF_FILES+= share/examples/rsyslog/rsyslog.conf \
64 ${PKG_SYSCONFDIR}/rsyslog.conf 59 ${PKG_SYSCONFDIR}/rsyslog.conf
65 60
66post-install: 61post-install:
67 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 62 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
68 ${INSTALL_DATA} ${WRKSRC}/platform/redhat/rsyslog.conf \ 63 ${INSTALL_DATA} ${WRKSRC}/platform/redhat/rsyslog.conf \
69 ${DESTDIR}${EGDIR}/rsyslog.conf 64 ${DESTDIR}${EGDIR}/rsyslog.conf
70 65
71BUILDLINK_API_DEPENDS.liblognorm+= liblognorm>=2.0.3 66BUILDLINK_API_DEPENDS.liblognorm+= liblognorm>=2.0.3
72.include "../../sysutils/liblognorm/buildlink3.mk" 67.include "../../sysutils/liblognorm/buildlink3.mk"
 68.include "../../mk/atomic64.mk"
73.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"
cvs diff -r1.191 -r1.192 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2020/12/17 09:53:15 1.191
+++ pkgsrc/www/firefox/mozilla-common.mk 2020/12/31 20:04:13 1.192
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.191 2020/12/17 09:53:15 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.192 2020/12/31 20:04:13 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -38,29 +38,28 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL @@ -38,29 +38,28 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL
38 38
39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
40 -isystem${X11BASE}/include/pixman-1" 40 -isystem${X11BASE}/include/pixman-1"
41 41
42test: 42test:
43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
45 45
46# tar(1) of OpenBSD 5.5 has no --exclude command line option. 46# tar(1) of OpenBSD 5.5 has no --exclude command line option.
47.if ${OPSYS} == "OpenBSD" 47.if ${OPSYS} == "OpenBSD"
48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
49USE_TOOLS+= bsdtar 49USE_TOOLS+= bsdtar
50.endif 50.endif
 51
51.if ${MACHINE_ARCH} == "i386" 52.if ${MACHINE_ARCH} == "i386"
52# Fix for PR pkg/48152. 
53CXXFLAGS+= -march=i586 
54# This is required for SSE2 code under i386. 53# This is required for SSE2 code under i386.
55CXXFLAGS+= -mstackrealign 54CXXFLAGS+= -mstackrealign
56.endif 55.endif
57 56
58CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 57CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
59CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 58CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
60CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 59CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
61CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 60CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
62CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 61CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
63CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 62CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
64#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 63#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
65 64
66CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 65CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
@@ -145,31 +144,27 @@ fix-clang-wrapper: @@ -145,31 +144,27 @@ fix-clang-wrapper:
145# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. 144# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
146# This breaks the build. 145# This breaks the build.
147 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang 146 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
148 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ 147 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
149 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp 148 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
150.endif 149.endif
151 150
152# The configure test for __thread succeeds, but later we end up with: 151# The configure test for __thread succeeds, but later we end up with:
153# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 152# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
154CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 153CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
155# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 154# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
156CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 155CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
157 156
158# PR pkg/55456 157.include "../../mk/atomic64.mk"
159.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 
160.include "../../devel/libatomic/buildlink3.mk" 
161CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes 
162.endif 
163BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 158BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
164.include "../../devel/libevent/buildlink3.mk" 159.include "../../devel/libevent/buildlink3.mk"
165.include "../../devel/libffi/buildlink3.mk" 160.include "../../devel/libffi/buildlink3.mk"
166BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26 161BUILDLINK_API_DEPENDS.nspr+= nspr>=4.26
167.include "../../devel/nspr/buildlink3.mk" 162.include "../../devel/nspr/buildlink3.mk"
168.include "../../textproc/icu/buildlink3.mk" 163.include "../../textproc/icu/buildlink3.mk"
169BUILDLINK_API_DEPENDS.nss+= nss>=3.59 164BUILDLINK_API_DEPENDS.nss+= nss>=3.59
170.include "../../devel/nss/buildlink3.mk" 165.include "../../devel/nss/buildlink3.mk"
171.include "../../devel/zlib/buildlink3.mk" 166.include "../../devel/zlib/buildlink3.mk"
172#.include "../../mk/jpeg.buildlink3.mk" 167#.include "../../mk/jpeg.buildlink3.mk"
173.include "../../graphics/MesaLib/buildlink3.mk" 168.include "../../graphics/MesaLib/buildlink3.mk"
174#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 169#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
175#.include "../../graphics/cairo/buildlink3.mk" 170#.include "../../graphics/cairo/buildlink3.mk"
cvs diff -r1.12 -r1.13 pkgsrc/www/firefox52/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox52/mozilla-common.mk 2020/12/23 08:20:04 1.12
+++ pkgsrc/www/firefox52/mozilla-common.mk 2020/12/31 20:04:13 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.12 2020/12/23 08:20:04 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.13 2020/12/31 20:04:13 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8# GCC 4.6 is required to support nullptr. 8# GCC 4.6 is required to support nullptr.
9GCC_REQD+= 4.8 9GCC_REQD+= 4.8
10 10
11.include "../../mk/bsd.prefs.mk" 11.include "../../mk/bsd.prefs.mk"
12 12
13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 13.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 14BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
@@ -23,28 +23,26 @@ USE_TOOLS+= pkg-config perl gmake autoc @@ -23,28 +23,26 @@ USE_TOOLS+= pkg-config perl gmake autoc
23USE_LANGUAGES+= c99 c++ 23USE_LANGUAGES+= c99 c++
24UNLIMIT_RESOURCES+= datasize 24UNLIMIT_RESOURCES+= datasize
25 25
26test: 26test:
27 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 27 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
28 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 28 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
29 29
30# tar(1) of OpenBSD 5.5 has no --exclude command line option. 30# tar(1) of OpenBSD 5.5 has no --exclude command line option.
31.if ${OPSYS} == "OpenBSD" 31.if ${OPSYS} == "OpenBSD"
32TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 32TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
33USE_TOOLS+= bsdtar 33USE_TOOLS+= bsdtar
34.endif 34.endif
35.if ${MACHINE_ARCH} == "i386" 35.if ${MACHINE_ARCH} == "i386"
36# Fix for PR pkg/48152. 
37CXXFLAGS+= -march=i586 
38# This is required for SSE2 code under i386. 36# This is required for SSE2 code under i386.
39CXXFLAGS+= -mstackrealign 37CXXFLAGS+= -mstackrealign
40.endif 38.endif
41 39
42CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 40CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
43CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 41CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
44CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 42CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
45CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 43CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
46CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 44CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
47CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 45CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
48 46
49.if ${OPSYS} != "SunOS" 47.if ${OPSYS} != "SunOS"
50CONFIGURE_ARGS+= --enable-pie 48CONFIGURE_ARGS+= --enable-pie
@@ -130,26 +128,27 @@ create-rm-wrapper: @@ -130,26 +128,27 @@ create-rm-wrapper:
130# The configure test for __thread succeeds, but later we end up with: 128# The configure test for __thread succeeds, but later we end up with:
131# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 129# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
132CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 130CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
133 131
134.if ${OPSYS} == "SunOS" 132.if ${OPSYS} == "SunOS"
135# native libbz2.so hides BZ2_crc32Table 133# native libbz2.so hides BZ2_crc32Table
136PREFER.bzip2?= pkgsrc 134PREFER.bzip2?= pkgsrc
137.endif 135.endif
138 136
139PYTHON_VERSIONS_ACCEPTED= 27 137PYTHON_VERSIONS_ACCEPTED= 27
140PYTHON_FOR_BUILD_ONLY= tool 138PYTHON_FOR_BUILD_ONLY= tool
141TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 139TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
142 140
 141.include "../../mk/atomic64.mk"
143.include "../../archivers/bzip2/buildlink3.mk" 142.include "../../archivers/bzip2/buildlink3.mk"
144BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 143BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
145.include "../../devel/libevent/buildlink3.mk" 144.include "../../devel/libevent/buildlink3.mk"
146.include "../../devel/libffi/buildlink3.mk" 145.include "../../devel/libffi/buildlink3.mk"
147BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12 146BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12
148.include "../../devel/nspr/buildlink3.mk" 147.include "../../devel/nspr/buildlink3.mk"
149.include "../../textproc/icu/buildlink3.mk" 148.include "../../textproc/icu/buildlink3.mk"
150.include "../../devel/nss/buildlink3.mk" 149.include "../../devel/nss/buildlink3.mk"
151.include "../../devel/zlib/buildlink3.mk" 150.include "../../devel/zlib/buildlink3.mk"
152.include "../../mk/jpeg.buildlink3.mk" 151.include "../../mk/jpeg.buildlink3.mk"
153.include "../../graphics/MesaLib/buildlink3.mk" 152.include "../../graphics/MesaLib/buildlink3.mk"
154BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 153BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
155.include "../../graphics/cairo/buildlink3.mk" 154.include "../../graphics/cairo/buildlink3.mk"
cvs diff -r1.16 -r1.17 pkgsrc/www/firefox68/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/11/12 10:03:24 1.16
+++ pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/12/31 20:04:14 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.16 2020/11/12 10:03:24 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.17 2020/12/31 20:04:14 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7GCC_REQD+= 6.1 7GCC_REQD+= 6.1
8 8
9.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
10 10
11# Python 2.7 and Python 3.6 or later are required simultaneously. 11# Python 2.7 and Python 3.6 or later are required simultaneously.
12PYTHON_VERSIONS_ACCEPTED= 27 12PYTHON_VERSIONS_ACCEPTED= 27
13PYTHON_FOR_BUILD_ONLY= tool 13PYTHON_FOR_BUILD_ONLY= tool
14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
@@ -48,28 +48,26 @@ test: @@ -48,28 +48,26 @@ test:
48 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 48 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
49 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 49 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
50 50
51# tar(1) of OpenBSD 5.5 has no --exclude command line option. 51# tar(1) of OpenBSD 5.5 has no --exclude command line option.
52.if ${OPSYS} == "OpenBSD" 52.if ${OPSYS} == "OpenBSD"
53TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 53TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
54USE_TOOLS+= bsdtar 54USE_TOOLS+= bsdtar
55.endif 55.endif
56.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \ 56.if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \
57 !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*) 57 !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*)
58USE_PKGSRC_GCC_RUNTIME= yes 58USE_PKGSRC_GCC_RUNTIME= yes
59.endif 59.endif
60.if ${MACHINE_ARCH} == "i386" 60.if ${MACHINE_ARCH} == "i386"
61# Fix for PR pkg/48152. 
62CXXFLAGS+= -march=i586 
63# This is required for SSE2 code under i386. 61# This is required for SSE2 code under i386.
64CXXFLAGS+= -mstackrealign 62CXXFLAGS+= -mstackrealign
65.endif 63.endif
66 64
67CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 65CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
68CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 66CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
69CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 67CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
70CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 68CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
71CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 69CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
72CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 70CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
73#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 71#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
74 72
75CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 73CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
@@ -157,26 +155,27 @@ create-rm-wrapper: @@ -157,26 +155,27 @@ create-rm-wrapper:
157 chmod +x ${WRAPPER_DIR}/bin/rm 155 chmod +x ${WRAPPER_DIR}/bin/rm
158 156
159# The configure test for __thread succeeds, but later we end up with: 157# The configure test for __thread succeeds, but later we end up with:
160# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 158# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
161CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 159CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
162# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 160# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
163CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 161CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
164 162
165.if ${OPSYS} == "SunOS" 163.if ${OPSYS} == "SunOS"
166# native libbz2.so hides BZ2_crc32Table 164# native libbz2.so hides BZ2_crc32Table
167PREFER.bzip2?= pkgsrc 165PREFER.bzip2?= pkgsrc
168.endif 166.endif
169 167
 168.include "../../mk/atomic64.mk"
170.include "../../archivers/bzip2/buildlink3.mk" 169.include "../../archivers/bzip2/buildlink3.mk"
171BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 170BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
172.include "../../devel/libevent/buildlink3.mk" 171.include "../../devel/libevent/buildlink3.mk"
173.include "../../devel/libffi/buildlink3.mk" 172.include "../../devel/libffi/buildlink3.mk"
174BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21 173BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21
175.include "../../devel/nspr/buildlink3.mk" 174.include "../../devel/nspr/buildlink3.mk"
176.include "../../textproc/icu/buildlink3.mk" 175.include "../../textproc/icu/buildlink3.mk"
177BUILDLINK_API_DEPENDS.nss+= nss>=3.44.1 176BUILDLINK_API_DEPENDS.nss+= nss>=3.44.1
178.include "../../devel/nss/buildlink3.mk" 177.include "../../devel/nss/buildlink3.mk"
179.include "../../devel/zlib/buildlink3.mk" 178.include "../../devel/zlib/buildlink3.mk"
180#.include "../../mk/jpeg.buildlink3.mk" 179#.include "../../mk/jpeg.buildlink3.mk"
181.include "../../graphics/MesaLib/buildlink3.mk" 180.include "../../graphics/MesaLib/buildlink3.mk"
182#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 181#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
cvs diff -r1.6 -r1.7 pkgsrc/www/firefox78/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/11/16 20:21:29 1.6
+++ pkgsrc/www/firefox78/Attic/mozilla-common.mk 2020/12/31 20:04:14 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.6 2020/11/16 20:21:29 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
14CONFIGURE_ARGS+= --prefix=${PREFIX} 14CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -39,28 +39,26 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL @@ -39,28 +39,26 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PL
39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \ 39CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
40 -isystem${X11BASE}/include/pixman-1" 40 -isystem${X11BASE}/include/pixman-1"
41 41
42test: 42test:
43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 43 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 44 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
45 45
46# tar(1) of OpenBSD 5.5 has no --exclude command line option. 46# tar(1) of OpenBSD 5.5 has no --exclude command line option.
47.if ${OPSYS} == "OpenBSD" 47.if ${OPSYS} == "OpenBSD"
48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 48TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
49USE_TOOLS+= bsdtar 49USE_TOOLS+= bsdtar
50.endif 50.endif
51.if ${MACHINE_ARCH} == "i386" 51.if ${MACHINE_ARCH} == "i386"
52# Fix for PR pkg/48152. 
53CXXFLAGS+= -march=i586 
54# This is required for SSE2 code under i386. 52# This is required for SSE2 code under i386.
55CXXFLAGS+= -mstackrealign 53CXXFLAGS+= -mstackrealign
56.endif 54.endif
57 55
58CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 56CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
59CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 57CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
60CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 58CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
61CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 59CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
62CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 60CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
63CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 61CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
64#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh 62#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
65 63
66CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 64CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
@@ -153,31 +151,27 @@ fix-clang-wrapper: @@ -153,31 +151,27 @@ fix-clang-wrapper:
153# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. 151# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc.
154# This breaks the build. 152# This breaks the build.
155 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang 153 ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang
156 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ 154 ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++
157 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp 155 ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp
158.endif 156.endif
159 157
160# The configure test for __thread succeeds, but later we end up with: 158# The configure test for __thread succeeds, but later we end up with:
161# dist/bin/libxul.so: undefined reference to `__tls_get_addr' 159# dist/bin/libxul.so: undefined reference to `__tls_get_addr'
162CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no 160CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no
163# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. 161# In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails.
164CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= 162CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic=
165 163
166# PR pkg/55456 164.include "../../mk/atomic64.mk"
167.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" 
168.include "../../devel/libatomic/buildlink3.mk" 
169CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes 
170.endif 
171BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 165BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
172.include "../../devel/libevent/buildlink3.mk" 166.include "../../devel/libevent/buildlink3.mk"
173.include "../../devel/libffi/buildlink3.mk" 167.include "../../devel/libffi/buildlink3.mk"
174BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25 168BUILDLINK_API_DEPENDS.nspr+= nspr>=4.25
175.include "../../devel/nspr/buildlink3.mk" 169.include "../../devel/nspr/buildlink3.mk"
176.include "../../textproc/icu/buildlink3.mk" 170.include "../../textproc/icu/buildlink3.mk"
177BUILDLINK_API_DEPENDS.nss+= nss>=3.53 171BUILDLINK_API_DEPENDS.nss+= nss>=3.53
178.include "../../devel/nss/buildlink3.mk" 172.include "../../devel/nss/buildlink3.mk"
179.include "../../devel/zlib/buildlink3.mk" 173.include "../../devel/zlib/buildlink3.mk"
180#.include "../../mk/jpeg.buildlink3.mk" 174#.include "../../mk/jpeg.buildlink3.mk"
181.include "../../graphics/MesaLib/buildlink3.mk" 175.include "../../graphics/MesaLib/buildlink3.mk"
182#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 176#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
183#.include "../../graphics/cairo/buildlink3.mk" 177#.include "../../graphics/cairo/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/seamonkey/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/mozilla-common.mk 2020/12/23 08:19:30 1.6
+++ pkgsrc/www/seamonkey/mozilla-common.mk 2020/12/31 20:04:14 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.6 2020/12/23 08:19:30 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/seamonkey/Makefile 5# used by www/seamonkey/Makefile
6 6
7HAS_CONFIGURE= yes 7HAS_CONFIGURE= yes
8CONFIGURE_ARGS+= --prefix=${PREFIX} 8CONFIGURE_ARGS+= --prefix=${PREFIX}
9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
10USE_LANGUAGES+= c99 c++ 10USE_LANGUAGES+= c99 c++
11UNLIMIT_RESOURCES+= datasize virtualsize 11UNLIMIT_RESOURCES+= datasize virtualsize
12 12
13GCC_REQD+= 4.9 13GCC_REQD+= 4.9
14 14
@@ -44,28 +44,26 @@ CONFIGURE_ENV+= BINDGEN_CFLAGS="-isyste @@ -44,28 +44,26 @@ CONFIGURE_ENV+= BINDGEN_CFLAGS="-isyste
44# with files/*.rs for Rust 1.39.0 44# with files/*.rs for Rust 1.39.0
45CONFIGURE_ARGS+= --disable-stylo-build-bindgen 45CONFIGURE_ARGS+= --disable-stylo-build-bindgen
46 46
47test: 47test:
48 cd ${WRKSRC}/${OBJDIR}/dist/bin && \ 48 cd ${WRKSRC}/${OBJDIR}/dist/bin && \
49 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey 49 ./run-mozilla.sh ${WRKSRC}/mach check-spidermonkey
50 50
51# tar(1) of OpenBSD 5.5 has no --exclude command line option. 51# tar(1) of OpenBSD 5.5 has no --exclude command line option.
52.if ${OPSYS} == "OpenBSD" 52.if ${OPSYS} == "OpenBSD"
53TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} 53TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar}
54USE_TOOLS+= bsdtar 54USE_TOOLS+= bsdtar
55.endif 55.endif
56.if ${MACHINE_ARCH} == "i386" 56.if ${MACHINE_ARCH} == "i386"
57# Fix for PR pkg/48152. 
58CXXFLAGS+= -march=i586 
59# This is required for SSE2 code under i386. 57# This is required for SSE2 code under i386.
60CXXFLAGS+= -mstackrealign 58CXXFLAGS+= -mstackrealign
61.endif 59.endif
62 60
63CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 61CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
64CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 62CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
65CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh 63CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
66CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure 64CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
67CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 65CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
68CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 66CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
69 67
70CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 68CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
71.if ${OPSYS} != "SunOS" 69.if ${OPSYS} != "SunOS"
@@ -190,26 +188,27 @@ CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyw @@ -190,26 +188,27 @@ CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyw
190.if ${OPSYS} == "SunOS" 188.if ${OPSYS} == "SunOS"
191# native libbz2.so hides BZ2_crc32Table 189# native libbz2.so hides BZ2_crc32Table
192PREFER.bzip2?= pkgsrc 190PREFER.bzip2?= pkgsrc
193.endif 191.endif
194 192
195.if ${OPSYS} == "OpenBSD" 193.if ${OPSYS} == "OpenBSD"
196PLIST_SUBST+= DLL_SUFFIX=".so.1.0" 194PLIST_SUBST+= DLL_SUFFIX=".so.1.0"
197.elif ${OPSYS} == "Darwin" 195.elif ${OPSYS} == "Darwin"
198PLIST_SUBST+= DLL_SUFFIX=".dylib" 196PLIST_SUBST+= DLL_SUFFIX=".dylib"
199.else 197.else
200PLIST_SUBST+= DLL_SUFFIX=".so" 198PLIST_SUBST+= DLL_SUFFIX=".so"
201.endif 199.endif
202 200
 201.include "../../mk/atomic64.mk"
203.include "../../archivers/bzip2/buildlink3.mk" 202.include "../../archivers/bzip2/buildlink3.mk"
204BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 203BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
205.include "../../devel/libevent/buildlink3.mk" 204.include "../../devel/libevent/buildlink3.mk"
206.include "../../devel/libffi/buildlink3.mk" 205.include "../../devel/libffi/buildlink3.mk"
207BUILDLINK_API_DEPENDS.nspr+= nspr>=4.18 206BUILDLINK_API_DEPENDS.nspr+= nspr>=4.18
208.include "../../devel/nspr/buildlink3.mk" 207.include "../../devel/nspr/buildlink3.mk"
209.include "../../textproc/icu/buildlink3.mk" 208.include "../../textproc/icu/buildlink3.mk"
210BUILDLINK_API_DEPENDS.nss+= nss>=3.35 209BUILDLINK_API_DEPENDS.nss+= nss>=3.35
211.include "../../devel/nss/buildlink3.mk" 210.include "../../devel/nss/buildlink3.mk"
212.include "../../devel/zlib/buildlink3.mk" 211.include "../../devel/zlib/buildlink3.mk"
213#.include "../../mk/jpeg.buildlink3.mk" 212#.include "../../mk/jpeg.buildlink3.mk"
214.include "../../graphics/MesaLib/buildlink3.mk" 213.include "../../graphics/MesaLib/buildlink3.mk"
215#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 214#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
cvs diff -r1.199 -r1.200 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2020/12/15 17:59:00 1.199
+++ pkgsrc/www/webkit-gtk/Makefile 2020/12/31 20:04:14 1.200
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.199 2020/12/15 17:59:00 leot Exp $ 1# $NetBSD: Makefile,v 1.200 2020/12/31 20:04:14 nia Exp $
2 2
3DISTNAME= webkitgtk-2.30.4 3DISTNAME= webkitgtk-2.30.4
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= https://www.webkitgtk.org/releases/ 6MASTER_SITES= https://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.webkitgtk.org/ 10HOMEPAGE= https://www.webkitgtk.org/
11COMMENT= GTK port of the WebKit browser engine 11COMMENT= GTK port of the WebKit browser engine
12LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
13 13
14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
@@ -145,14 +145,15 @@ BUILDLINK_API_DEPENDS.gstreamer1+= gstre @@ -145,14 +145,15 @@ BUILDLINK_API_DEPENDS.gstreamer1+= gstre
145BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 145BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
146.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 146.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
147BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 147BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
148.include "../../net/libsoup/buildlink3.mk" 148.include "../../net/libsoup/buildlink3.mk"
149.include "../../security/libsecret/buildlink3.mk" 149.include "../../security/libsecret/buildlink3.mk"
150.include "../../security/libtasn1/buildlink3.mk" 150.include "../../security/libtasn1/buildlink3.mk"
151.include "../../sysutils/libnotify/buildlink3.mk" 151.include "../../sysutils/libnotify/buildlink3.mk"
152.include "../../textproc/icu/buildlink3.mk" 152.include "../../textproc/icu/buildlink3.mk"
153.include "../../textproc/libxslt/buildlink3.mk" 153.include "../../textproc/libxslt/buildlink3.mk"
154.include "../../x11/gtk3/buildlink3.mk" 154.include "../../x11/gtk3/buildlink3.mk"
155.include "../../x11/libXdamage/buildlink3.mk" 155.include "../../x11/libXdamage/buildlink3.mk"
156.include "../../x11/libXt/buildlink3.mk" 156.include "../../x11/libXt/buildlink3.mk"
157.include "../../mk/pthread.buildlink3.mk" 157.include "../../mk/pthread.buildlink3.mk"
 158.include "../../mk/atomic64.mk"
158.include "../../mk/bsd.pkg.mk" 159.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/www/webkit-gtk/Attic/hacks.mk
cvs diff -r1.19 -r1.20 pkgsrc/www/webkit24-gtk/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/webkit24-gtk/Attic/Makefile.common 2020/11/06 15:30:10 1.19
+++ pkgsrc/www/webkit24-gtk/Attic/Makefile.common 2020/12/31 20:04:14 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2020/11/06 15:30:10 nia Exp $ 1# $NetBSD: Makefile.common,v 1.20 2020/12/31 20:04:14 nia Exp $
2# used by www/webkit24-gtk/Makefile 2# used by www/webkit24-gtk/Makefile
3# used by www/webkit24-gtk3/Makefile 3# used by www/webkit24-gtk3/Makefile
4 4
5DISTNAME= webkitgtk-2.4.11 5DISTNAME= webkitgtk-2.4.11
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
12LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
13 13
14DISTINFO_FILE= ${.CURDIR}/../../www/webkit24-gtk/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../www/webkit24-gtk/distinfo
@@ -73,26 +73,27 @@ CXXFLAGS+= -Wno-c++11-narrowing @@ -73,26 +73,27 @@ CXXFLAGS+= -Wno-c++11-narrowing
73.endif 73.endif
74 74
75CXXFLAGS+= -Wno-expansion-to-defined 75CXXFLAGS+= -Wno-expansion-to-defined
76 76
77.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) 77.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
78CONFIGURE_ARGS+= --disable-fast-malloc 78CONFIGURE_ARGS+= --disable-fast-malloc
79CPPFLAGS+= -DUSE_SYSTEM_MALLOC 79CPPFLAGS+= -DUSE_SYSTEM_MALLOC
80.endif 80.endif
81 81
82.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm" 82.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
83LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory 83LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory
84.endif 84.endif
85 85
 86.include "../../mk/atomic64.mk"
86BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 87BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
87.include "../../devel/glib2/buildlink3.mk" 88.include "../../devel/glib2/buildlink3.mk"
88.include "../../devel/zlib/buildlink3.mk" 89.include "../../devel/zlib/buildlink3.mk"
89.include "../../databases/sqlite3/buildlink3.mk" 90.include "../../databases/sqlite3/buildlink3.mk"
90.include "../../devel/flex/buildlink3.mk" 91.include "../../devel/flex/buildlink3.mk"
91.include "../../devel/gperf/buildlink3.mk" 92.include "../../devel/gperf/buildlink3.mk"
92# This is optional, but needs testing. 93# This is optional, but needs testing.
93#.include "../../devel/pango/buildlink3.mk" 94#.include "../../devel/pango/buildlink3.mk"
94# A correct Webkit build requires flex 2.5.33 95# A correct Webkit build requires flex 2.5.33
95.include "../../fonts/harfbuzz-icu/buildlink3.mk" 96.include "../../fonts/harfbuzz-icu/buildlink3.mk"
96.include "../../graphics/freetype2/buildlink3.mk" 97.include "../../graphics/freetype2/buildlink3.mk"
97.include "../../graphics/libwebp/buildlink3.mk" 98.include "../../graphics/libwebp/buildlink3.mk"
98.include "../../graphics/MesaLib/buildlink3.mk" 99.include "../../graphics/MesaLib/buildlink3.mk"
File Deleted: pkgsrc/www/webkit24-gtk/Attic/hacks.mk
File Deleted: pkgsrc/www/webkit24-gtk3/Attic/hacks.mk
cvs diff -r1.84 -r1.85 pkgsrc/x11/qt5-qtwebkit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2020/11/21 23:13:11 1.84
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2020/12/31 20:04:14 1.85
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.84 2020/11/21 23:13:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.85 2020/12/31 20:04:14 nia Exp $
2 2
3QTWKVERSION= 5.212.0-alpha4 3QTWKVERSION= 5.212.0-alpha4
4DISTNAME= qtwebkit-${QTWKVERSION} 4DISTNAME= qtwebkit-${QTWKVERSION}
5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./} 5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= x11 www 7CATEGORIES= x11 www
8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/}
9GITHUB_PROJECT= qtwebkit 9GITHUB_PROJECT= qtwebkit
10GITHUB_RELEASE= ${DISTNAME} 10GITHUB_RELEASE= ${DISTNAME}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki 14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki
@@ -63,31 +63,26 @@ INSTALLATION_DIRS+= lib/pkgconfig @@ -63,31 +63,26 @@ INSTALLATION_DIRS+= lib/pkgconfig
63 63
64.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
65 65
66.if ${_USE_CWRAPPERS} == "yes" 66.if ${_USE_CWRAPPERS} == "yes"
67BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib 67BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib
68.else 68.else
69BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib 69BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib
70.endif 70.endif
71 71
72.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*arm*) 72.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*arm*)
73LDFLAGS+= -Wl,--no-keep-memory 73LDFLAGS+= -Wl,--no-keep-memory
74.endif 74.endif
75 75
76# 64-bit atomic ops are required 
77.if ${MACHINE_ARCH} == "i386" 
78CXXFLAGS+= -march=i586 
79.endif 
80 
81post-install: 76post-install:
82.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc 77.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
83 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 78 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
84 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i} 79 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i}
85.endfor 80.endfor
86 81
87.include "../../databases/sqlite3/buildlink3.mk" 82.include "../../databases/sqlite3/buildlink3.mk"
88.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 83.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
89.include "../../devel/libexecinfo/buildlink3.mk" 84.include "../../devel/libexecinfo/buildlink3.mk"
90.endif 85.endif
91.include "../../fonts/woff2/buildlink3.mk" 86.include "../../fonts/woff2/buildlink3.mk"
92.include "../../graphics/libwebp/buildlink3.mk" 87.include "../../graphics/libwebp/buildlink3.mk"
93.include "../../textproc/hyphen/buildlink3.mk" 88.include "../../textproc/hyphen/buildlink3.mk"
@@ -98,14 +93,15 @@ post-install: @@ -98,14 +93,15 @@ post-install:
98.include "../../x11/libXcomposite/buildlink3.mk" 93.include "../../x11/libXcomposite/buildlink3.mk"
99.endif 94.endif
100.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 95.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
101.include "../../x11/qt5-qtlocation/buildlink3.mk" 96.include "../../x11/qt5-qtlocation/buildlink3.mk"
102.include "../../x11/qt5-qtsensors/buildlink3.mk" 97.include "../../x11/qt5-qtsensors/buildlink3.mk"
103.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 98.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
104PYTHON_FOR_BUILD_ONLY= tool 99PYTHON_FOR_BUILD_ONLY= tool
105.include "../../lang/python/tool.mk" 100.include "../../lang/python/tool.mk"
106.include "../../lang/ruby/buildlink3.mk" 101.include "../../lang/ruby/buildlink3.mk"
107BUILDLINK_DEPMETHOD.${RUBY_BASE}= build 102BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
108.include "../../mk/curses.buildlink3.mk" 103.include "../../mk/curses.buildlink3.mk"
109.include "../../mk/dlopen.buildlink3.mk" 104.include "../../mk/dlopen.buildlink3.mk"
110BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 105BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 106.include "../../mk/atomic64.mk"
111.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"