pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/filesystems/ori
Module Name: pkgsrc
Committed By: wiz
Date: Mon Jul 24 16:52:46 UTC 2023
Modified Files:
pkgsrc/filesystems/ori: Makefile distinfo
Added Files:
pkgsrc/filesystems/ori/patches: patch-SConstruct
patch-liboriutil_SConscript
Log Message:
ori: convert to scons4
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/filesystems/ori/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/ori/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/ori/patches/patch-SConstruct \
pkgsrc/filesystems/ori/patches/patch-liboriutil_SConscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/filesystems/ori/Makefile
diff -u pkgsrc/filesystems/ori/Makefile:1.18 pkgsrc/filesystems/ori/Makefile:1.19
--- pkgsrc/filesystems/ori/Makefile:1.18 Wed Apr 19 08:09:56 2023
+++ pkgsrc/filesystems/ori/Makefile Mon Jul 24 16:52:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/04/19 08:09:56 adam Exp $
+# $NetBSD: Makefile,v 1.19 2023/07/24 16:52:45 wiz Exp $
DISTNAME= ori-0.8.2
PKGREVISION= 5
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
# (insert swearing)
CWRAPPERS_APPEND.cxx+= -Wno-narrowing
-PYTHON_VERSIONS_ACCEPTED= 27 # python2 SCons files
+SCONS_INSTALL_ARGS+= DESTDIR=${DESTDIR}
SUBST_CLASSES+= man
SUBST_SED.man+= -e "s,share/man,${PKGMANDIR},"
@@ -32,19 +32,11 @@ _WRAP_EXTRA_ARGS.CXX+= -D_KERNTYPES
CWRAPPERS_APPEND.cxx+= -D_KERNTYPES
.endif
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN}
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${SCONSBIN} install PREFIX=${DESTDIR}${PREFIX}
-
-# configure script demands libevent 2.0 or greater
-BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0
-
.include "../../archivers/xz/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0
.include "../../devel/libevent/buildlink3.mk"
-PYTHON_FOR_BUILD_ONLY?= yes
-.include "../../devel/scons/buildlink3.mk"
+PYTHON_FOR_BUILD_ONLY= yes
+.include "../../devel/scons4/build.mk"
.include "../../mk/fuse.buildlink3.mk"
.include "../../net/mDNSResponder/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
Index: pkgsrc/filesystems/ori/distinfo
diff -u pkgsrc/filesystems/ori/distinfo:1.6 pkgsrc/filesystems/ori/distinfo:1.7
--- pkgsrc/filesystems/ori/distinfo:1.6 Tue Oct 26 10:25:30 2021
+++ pkgsrc/filesystems/ori/distinfo Mon Jul 24 16:52:45 2023
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:25:30 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/07/24 16:52:45 wiz Exp $
BLAKE2s (ori-0.8.2.tar.xz) = 2bdccbc1f76f2de550c65eb94f1be60efbb731673eb5e97ffc6d6d2fb59a4ca8
SHA512 (ori-0.8.2.tar.xz) = 19e913506cb5edb4961def9f19a97a9e3ac54d32f20e379830349fd8d5a37923ce97b3419a04d6cbd665c74d4aa0cd9a3cf6d23c5b7c63440f2cf3f51a8ac8bd
Size (ori-0.8.2.tar.xz) = 238576 bytes
+SHA1 (patch-SConstruct) = 91e98e6952986d36a86ad37bbadd7cc93cee6c6c
+SHA1 (patch-liboriutil_SConscript) = 9fd7b34f45be8878bd70b2059b050359693836de
SHA1 (patch-liboriutil_key.cc) = cb1b773b43ee53df75863d02186c1390ab114e01
SHA1 (patch-ori_SConscript) = e2eba2c01f2b6d4b7f3edea5eafc39656e047894
SHA1 (patch-ori__httpd_SConscript) = 8b8ba3a1545a87e9a3c150fec8c1e7c271cc8603
Added files:
Index: pkgsrc/filesystems/ori/patches/patch-SConstruct
diff -u /dev/null pkgsrc/filesystems/ori/patches/patch-SConstruct:1.1
--- /dev/null Mon Jul 24 16:52:46 2023
+++ pkgsrc/filesystems/ori/patches/patch-SConstruct Mon Jul 24 16:52:45 2023
@@ -0,0 +1,176 @@
+$NetBSD: patch-SConstruct,v 1.1 2023/07/24 16:52:45 wiz Exp $
+
+Support Python 3.
+
+--- SConstruct.orig 2019-01-28 01:12:19.000000000 +0000
++++ SConstruct
+@@ -61,21 +61,21 @@ env = Environment(options = opts,
+ Help(opts.GenerateHelpText(env))
+
+ # Copy environment variables
+-if os.environ.has_key('CC'):
++if 'CC' in os.environ:
+ env["CC"] = os.getenv('CC')
+-if os.environ.has_key('CXX'):
++if 'CXX' in os.environ:
+ env["CXX"] = os.getenv('CXX')
+-if os.environ.has_key('AS'):
++if 'AS' in os.environ:
+ env["AS"] = os.getenv('AS')
+-if os.environ.has_key('LD'):
++if 'LD' in os.environ:
+ env["LINK"] = os.getenv('LD')
+-if os.environ.has_key('CFLAGS'):
++if 'CFLAGS' in os.environ:
+ env.Append(CCFLAGS = SCons.Util.CLVar(os.environ['CFLAGS']))
+-if os.environ.has_key('CPPFLAGS'):
++if 'CPPFLAGS' in os.environ:
+ env.Append(CPPFLAGS = SCons.Util.CLVar(os.environ['CPPFLAGS']))
+-if os.environ.has_key('CXXFLAGS'):
++if 'CXXFLAGS' in os.environ:
+ env.Append(CXXFLAGS = SCons.Util.CLVar(os.environ['CXXFLAGS']))
+-if os.environ.has_key('LDFLAGS'):
++if 'LDFLAGS' in os.environ:
+ env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
+
+ # Windows Configuration Changes
+@@ -95,7 +95,7 @@ if sys.platform == "win32":
+ if env["HASH_ALGO"] == "SHA256":
+ env.Append(CPPFLAGS = [ "-DORI_USE_SHA256" ])
+ else:
+- print "Error unsupported hash algorithm"
++ print("Error unsupported hash algorithm")
+ sys.exit(-1)
+
+ if env["COMPRESSION_ALGO"] == "LZMA":
+@@ -105,9 +105,9 @@ elif env["COMPRESSION_ALGO"] == "FASTLZ"
+ elif env["COMPRESSION_ALGO"] == "SNAPPY":
+ env.Append(CPPFLAGS = [ "-DORI_USE_SNAPPY" ])
+ elif env["COMPRESSION_ALGO"] == "NONE":
+- print "Building without compression"
++ print("Building without compression")
+ else:
+- print "Error unsupported compression algorithm"
++ print("Error unsupported compression algorithm")
+ sys.exit(-1)
+
+ if env["CHUNKING_ALGO"] == "RK":
+@@ -115,7 +115,7 @@ if env["CHUNKING_ALGO"] == "RK":
+ elif env["CHUNKING_ALGO"] == "FIXED":
+ env.Append(CPPFLAGS = [ "-DORI_USE_FIXED" ])
+ else:
+- print "Error unsupported chunking algorithm"
++ print("Error unsupported chunking algorithm")
+ sys.exit(-1)
+
+ if not env["WITH_MDNS"]:
+@@ -135,7 +135,7 @@ elif env["BUILDTYPE"] == "PERF":
+ elif env["BUILDTYPE"] == "RELEASE":
+ env.Append(CPPFLAGS = ["-DNDEBUG", "-DORI_RELEASE", "-w", "-O2"])
+ else:
+- print "Error BUILDTYPE must be RELEASE or DEBUG"
++ print("Error BUILDTYPE must be RELEASE or DEBUG")
+ sys.exit(-1)
+
+ try:
+@@ -202,12 +202,12 @@ conf = env.Configure(custom_tests = { 'C
+ 'CheckPkgMinVersion' : CheckPkgMinVersion })
+
+ if not conf.CheckCC():
+- print 'Your C compiler and/or environment is incorrectly configured.'
++ print('Your C compiler and/or environment is incorrectly configured.')
+ CheckFailed()
+
+ env.AppendUnique(CXXFLAGS = ['-std=c++11'])
+ if not conf.CheckCXX():
+- print 'Your C++ compiler and/or environment is incorrectly configured.'
++ print('Your C++ compiler and/or environment is incorrectly configured.')
+ CheckFailed()
+
+ if (sys.platform == "win32") or env["CROSSCOMPILE"]:
+@@ -215,15 +215,15 @@ if (sys.platform == "win32") or env["CRO
+ else:
+ env["HAS_PKGCONFIG"] = True
+ if not conf.CheckPkgConfig():
+- print 'pkg-config not found!'
++ print('pkg-config not found!')
+ Exit(1)
+
+ if not conf.CheckCXXHeader('unordered_map'):
+- print 'C++11 libraries appear to be missing'
++ print('C++11 libraries appear to be missing')
+
+ if sys.platform.startswith("freebsd"):
+ if not conf.CheckLib('execinfo'):
+- print 'FreeBSD requires libexecinfo to build.'
++ print('FreeBSD requires libexecinfo to build.')
+ Exit(1)
+
+ check_uuid_h = conf.CheckCHeader('uuid.h')
+@@ -233,7 +233,7 @@ if check_uuid_h:
+ elif check_uuid_uuid_h:
+ env.Append(CPPFLAGS = "-DHAVE_UUID_UUID_H")
+ else:
+- print 'Supported UUID header is missing!'
++ print('Supported UUID header is missing!')
+ Exit(1)
+
+ if env["COMPRESSION_ALGO"] == "LZMA":
+@@ -241,39 +241,39 @@ if env["COMPRESSION_ALGO"] == "LZMA":
+ 'lzma.h',
+ 'C',
+ 'lzma_version_string();'):
+- print 'Please install liblzma'
++ print('Please install liblzma')
+ Exit(1)
+
+ if env["WITH_FUSE"]:
+ if env["HAS_PKGCONFIG"] and not conf.CheckPkg('fuse'):
+- print 'FUSE is not registered in pkg-config'
++ print('FUSE is not registered in pkg-config')
+ Exit(1)
+
+ if env["HAS_PKGCONFIG"]:
+ if not conf.CheckPkg('libevent'):
+- print 'libevent is not registered in pkg-config'
++ print('libevent is not registered in pkg-config')
+ Exit(1)
+ if not conf.CheckPkgMinVersion("libevent", "2.0"):
+- print 'libevent version 2.0 or above required'
++ print('libevent version 2.0 or above required')
+ Exit(1)
+ env.ParseConfig('pkg-config --libs --cflags libevent')
+
+ has_event = conf.CheckLibWithHeader('', 'event2/event.h', 'C', 'event_init();')
+ if not (has_event or (env["CROSSCOMPILE"])):
+- print 'Cannot link test binary with libevent 2.0+'
++ print('Cannot link test binary with libevent 2.0+')
+ Exit(1)
+
+ if (env["WITH_MDNS"]) and (sys.platform != "darwin"):
+ if not conf.CheckLibWithHeader('dns_sd','dns_sd.h','C'):
+- print 'Please install libdns_sd'
+- Exit(1)
++ print('Please install libdns_sd')
++ Exit(1)
+
+ if env["HAS_PKGCONFIG"]:
+ if not conf.CheckPkg("openssl"):
+- print 'openssl is not registered in pkg-config'
++ print('openssl is not registered in pkg-config')
+ Exit(1)
+ if not conf.CheckPkgMinVersion("openssl", "1.0.0"):
+- print 'openssl version 1.0.0 or above required'
++ print('openssl version 1.0.0 or above required')
+ Exit(1)
+ env.ParseConfig('pkg-config --libs --cflags openssl')
+
+@@ -313,7 +313,7 @@ if env["WITH_ASAN"]:
+ env.Append(CPPFLAGS = ["-fsanitize=address"])
+ env.Append(LINKFLAGS = ["-fsanitize=address"])
+ if env["WITH_TSAN"] and env["WITH_ASAN"]:
+- print "Cannot set both WITH_TSAN and WITH_ASAN!"
++ print("Cannot set both WITH_TSAN and WITH_ASAN!")
+ sys.exit(-1)
+
+ # libori
Index: pkgsrc/filesystems/ori/patches/patch-liboriutil_SConscript
diff -u /dev/null pkgsrc/filesystems/ori/patches/patch-liboriutil_SConscript:1.1
--- /dev/null Mon Jul 24 16:52:46 2023
+++ pkgsrc/filesystems/ori/patches/patch-liboriutil_SConscript Mon Jul 24 16:52:45 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-liboriutil_SConscript,v 1.1 2023/07/24 16:52:45 wiz Exp $
+
+Support Python 3.
+
+--- liboriutil/SConscript.orig 2019-01-28 01:12:19.000000000 +0000
++++ liboriutil/SConscript
+@@ -25,7 +25,7 @@ src = [
+ if os.name == 'posix':
+ src += ['mutex_posix.cc', 'rwlock_posix.cc', 'thread_posix.cc']
+ else:
+- print "Error unsupported operating system!"
++ print("Error unsupported operating system!")
+
+ if env["WITH_MDNS"]:
+ src.append("zeroconf.cc")
Home |
Main Index |
Thread Index |
Old Index