tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

No-one noticed that my package (cingg-netbsd) was broken :(



well, I think i fixed it from real NetBSD 10/amd64 installation ...

From 42b8603ab1f3b69841e1b9914cfbafc1f8db6091 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Date: Tue, 19 Nov 2024 05:06:25 +0300
Subject: [PATCH] cingg-netbsd: make it actually work on amd64 fresh install

---
 cingg-netbsd/Makefile         |  3 ++-
 cingg-netbsd/distinfo         |  1 +
 cingg-netbsd/patches/patch-ad | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 cingg-netbsd/patches/patch-ad

diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 959e450dc5..9b862d83a3 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE= https://www.cinelerra-gg.org/
 
 LICENSE= gnu-gpl-v2
 
-_ONLY_FOR_PLATFORM_= NetBSD-*-amd64 NetBSD-*-i386
+_ONLY_FOR_PLATFORM_= NetBSD-*-x86_64 NetBSD-*-i386
 
 USE_LANGUAGES= c c++
 
@@ -86,6 +86,7 @@ do-install:
  cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install
 
 
+.include "../../lang/python/tool.mk"
 .include "../../mk/tools/pkg-config.mk"
 .include "../../devel/pkgconf/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index b868262a34..a0eb84f329 100644
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -5,3 +5,4 @@ SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20
 Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
 SHA1 (patch-aa) = c15fb44c81ac2d36af8fd4d4aa0ddcc38812675e
 SHA1 (patch-ac) = baa34cf5a6315d6612b14e6ff78aa9cd81e1eb73
+SHA1 (patch-ad) = 85709f034e7f76c67c95bfc4fa2dd1094e476c00
diff --git a/cingg-netbsd/patches/patch-ad b/cingg-netbsd/patches/patch-ad
new file mode 100644
index 0000000000..711b5bf371
--- /dev/null
+++ b/cingg-netbsd/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Bash in /usr/pkg/bin on NetBSD
+
+--- ./cinelerra-5.1/inst.sh.orig 2024-11-19 04:54:37.057900686 +0300
++++ ./cinelerra-5.1/inst.sh 2024-11-19 04:55:11.775405100 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash -e
++#!/usr/pkg/bin/bash -e
+ # inst.sh <dir> <objs...>
+ dir="$1"; shift 1
+ mkdir -p "$dir"
--
2.46.1

Yes, it still only set up for two NetBSD variants .

I think I tested on modified from my root position NetBSD, so there was
symlink  to /bin/bash :(

added python as tool dependency

fixed  our install script that was pointing to bin/bash

Initially i downloaded wrong pkgsrc archive, correct one seems to be quarterly one, for new 10.0 installs.

I wonder if I should re-request access to pkgsrc-wip from this machine, or wait until I reconnect
my Linux hdd back in place of netBSD hdd?

Also, how to check that pr-send actually send emails (or how it communicate with server?

I got one more problem report to report (Nedit coredumps)
From 42b8603ab1f3b69841e1b9914cfbafc1f8db6091 Mon Sep 17 00:00:00 2001
From: Andrew Randrianasulu <randrianasulu%gmail.com@localhost>
Date: Tue, 19 Nov 2024 05:06:25 +0300
Subject: [PATCH] cingg-netbsd: make it actually work on amd64 fresh install

---
 cingg-netbsd/Makefile         |  3 ++-
 cingg-netbsd/distinfo         |  1 +
 cingg-netbsd/patches/patch-ad | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 cingg-netbsd/patches/patch-ad

diff --git a/cingg-netbsd/Makefile b/cingg-netbsd/Makefile
index 959e450dc5..9b862d83a3 100644
--- a/cingg-netbsd/Makefile
+++ b/cingg-netbsd/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE=	https://www.cinelerra-gg.org/
 
 LICENSE=	gnu-gpl-v2
 
-ONLY_FOR_PLATFORM=	NetBSD-*-amd64 NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-x86_64 NetBSD-*-i386
 
 USE_LANGUAGES=		c c++
 
@@ -86,6 +86,7 @@ do-install:
 	cd ${CONFIGURE_DIRS} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install
 
 
+.include "../../lang/python/tool.mk"
 .include "../../mk/tools/pkg-config.mk"
 .include "../../devel/pkgconf/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
diff --git a/cingg-netbsd/distinfo b/cingg-netbsd/distinfo
index b868262a34..a0eb84f329 100644
--- a/cingg-netbsd/distinfo
+++ b/cingg-netbsd/distinfo
@@ -5,3 +5,4 @@ SHA512 (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 410e311544a73061e0042045f20
 Size (cinelerra-gg-5.1-20240703-73eb8f8d.tar.gz) = 195630107 bytes
 SHA1 (patch-aa) = c15fb44c81ac2d36af8fd4d4aa0ddcc38812675e
 SHA1 (patch-ac) = baa34cf5a6315d6612b14e6ff78aa9cd81e1eb73
+SHA1 (patch-ad) = 85709f034e7f76c67c95bfc4fa2dd1094e476c00
diff --git a/cingg-netbsd/patches/patch-ad b/cingg-netbsd/patches/patch-ad
new file mode 100644
index 0000000000..711b5bf371
--- /dev/null
+++ b/cingg-netbsd/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Bash in /usr/pkg/bin on NetBSD
+
+--- ./cinelerra-5.1/inst.sh.orig	2024-11-19 04:54:37.057900686 +0300
++++ ./cinelerra-5.1/inst.sh	2024-11-19 04:55:11.775405100 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/bash -e
++#!/usr/pkg/bin/bash -e
+ # inst.sh <dir> <objs...>
+ dir="$1"; shift 1
+ mkdir -p "$dir"
-- 
2.46.1



Home | Main Index | Thread Index | Old Index