CVS commit: pkgsrc/mbone/vic-devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mbone/vic-devel
From: "Havard Eidnes" <he%netbsd.org@localhost>
Date: Sat, 26 Apr 2025 18:25:15 +0000

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Apr 26 18:25:15 UTC 2025

Modified Files:
        pkgsrc/mbone/vic-devel: Makefile distinfo
        pkgsrc/mbone/vic-devel/patches: patch-configure

Log Message:
mbone/vic-devel: make this build with updated TCL.

Adapt to change of syntax for TCL_PACKAGE_PATH (and TK_PACKAGE_PATH).
The newest TCL now uses a colon-separated string, whereas it earlier
used a space-separated string.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mbone/vic-devel/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mbone/vic-devel/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mbone/vic-devel/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mbone/vic-devel/Makefile
diff -u pkgsrc/mbone/vic-devel/Makefile:1.31 pkgsrc/mbone/vic-devel/Makefile:1.32
--- pkgsrc/mbone/vic-devel/Makefile:1.31        Mon Jan 27 16:35:10 2025
+++ pkgsrc/mbone/vic-devel/Makefile     Sat Apr 26 18:25:14 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2025/01/27 16:35:10 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2025/04/26 18:25:14 he Exp $
 
 DISTNAME=      vic-2.8ucl1.4.0beta-4337
 PKGNAME=       vic-devel-2.8.1.4.0beta.4337
-PKGREVISION=   21
+PKGREVISION=   22
 CATEGORIES=    mbone tk
 MASTER_SITES=  http://www.NetBSD.org/~sborrill/snapshots/
+LICENSE=       modified-bsd
 
 MAKE_JOBS_SAFE=        no
 

Index: pkgsrc/mbone/vic-devel/distinfo
diff -u pkgsrc/mbone/vic-devel/distinfo:1.10 pkgsrc/mbone/vic-devel/distinfo:1.11
--- pkgsrc/mbone/vic-devel/distinfo:1.10        Mon Jan 27 16:35:10 2025
+++ pkgsrc/mbone/vic-devel/distinfo     Sat Apr 26 18:25:14 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2025/01/27 16:35:10 wiz Exp $
+$NetBSD: distinfo,v 1.11 2025/04/26 18:25:14 he Exp $
 
 BLAKE2s (vic-2.8ucl1.4.0_ov511.diff.gz) = 6ee05f47167e8496673cc9eb029ac124cc91d78d1d8b9ba49962259dbc23534d
 SHA512 (vic-2.8ucl1.4.0_ov511.diff.gz) = b2618dddb2b07ceec37fb8f11d05c7164bc089f9f720c6d697e2d3b83f086bf2f1efeb99bf79f3b9d164f472fe485b31780d687c9f4fc04a28ba2d22a109dfb5
@@ -6,10 +6,13 @@ Size (vic-2.8ucl1.4.0_ov511.diff.gz) = 8
 BLAKE2s (vic-2.8ucl1.4.0beta-4337.tgz) = f1f9f42edab51c7a9d8858fa1f80157e956cd38450aec4b93c7f1deeb0d0d08c
 SHA512 (vic-2.8ucl1.4.0beta-4337.tgz) = d159ce47447432193d6b537beb6faeb3f2f64ba06223d9726ff813c6f81eff1a6a64bb1fd5a4edcf41b9e069c159e55a680e0edaf668817173b9dfe1fc068fef
 Size (vic-2.8ucl1.4.0beta-4337.tgz) = 9345775 bytes
+<<<<<<< distinfo
+=======
+>>>>>>> 1.10
 SHA1 (patch-Makefile.in) = 9f913eee4a9b9bfbf6e5735f04af97cdba92d297
 SHA1 (patch-codec_tmndec_store.c) = 65b7aa01864f428088788b0311a2c88dc7a46914
 SHA1 (patch-color-swscale.cpp) = 0796262c5db74cc354ce7f55ae246c489f5c9b33
-SHA1 (patch-configure) = bce8d7eacb17644689ba34bc2e5b776f9ce9665e
+SHA1 (patch-configure) = 7e884e3e32d8ce06a92573c2d08373e74e57af04
 SHA1 (patch-crypt-rijndael.cpp) = 5dfda8c17c91fa5f6b2df24d4e1ed93bc4ae5b87
 SHA1 (patch-grabber-v4l2.cpp) = 5f8f45dbdc506525eb457a518df2cf9b44857587
 SHA1 (patch-main.cpp) = 671cda41595f1f5c001b089ee04b5c84f559330a

Index: pkgsrc/mbone/vic-devel/patches/patch-configure
diff -u pkgsrc/mbone/vic-devel/patches/patch-configure:1.2 pkgsrc/mbone/vic-devel/patches/patch-configure:1.3
--- pkgsrc/mbone/vic-devel/patches/patch-configure:1.2  Tue Mar 31 15:49:57 2015
+++ pkgsrc/mbone/vic-devel/patches/patch-configure      Sat Apr 26 18:25:14 2025
@@ -1,14 +1,15 @@
-$NetBSD: patch-configure,v 1.2 2015/03/31 15:49:57 joerg Exp $
+$NetBSD: patch-configure,v 1.3 2025/04/26 18:25:14 he Exp $
 
 - Portability fixes
 - pkgsrc ffmpeg includes path
 - pkgsrc common-mml includes path
 - NetBSD v4l2 support
 - ov511 support on NetBSD
+- Support new style for TCL_PACKAGE_PATH (:-separated and not space-separated)
 
 --- configure.orig     2008-12-10 19:28:01.000000000 +0000
-+++ configure  2008-12-14 11:05:24.000000000 +0000
-@@ -4538,7 +4538,7 @@
++++ configure
+@@ -4538,7 +4538,7 @@ echo "${ECHO_T}Tcl ${TCL_VERSION}${TCL_P
          V_DEFINE="$V_DEFINE -DMAC_OSX_TCL"
      fi
  
@@ -17,7 +18,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
      if test -f "${TCL_SRC_DIR}/generic/tcl2c.c" ; then
          { echo "$as_me:$LINENO: result: UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&5
  echo "${ECHO_T}UCL Tcl ${TCL_VERSION}${TCL_PATCH_LEVEL}" >&6; }
-@@ -4752,7 +4752,7 @@
+@@ -4752,7 +4752,7 @@ echo "${ECHO_T}could not find ${TK_BIN_D
  
  { echo "$as_me:$LINENO: checking for a compatible version of Tk" >&5
  echo $ECHO_N "checking for a compatible version of Tk... $ECHO_C" >&6; }
@@ -26,7 +27,27 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
      { echo "$as_me:$LINENO: result: Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&5
  echo "${ECHO_T}Tk ${TK_VERSION}${TK_PATCH_LEVEL}" >&6; }
  
-@@ -5012,14 +5012,14 @@
+@@ -4793,7 +4793,7 @@ else
+         V_INCLUDE_TCL=$TCL_INCLUDE_SPEC
+ 
+         V_LIBRARY_TCL=FAIL
+-        for dir in $TCL_PACKAGE_PATH; do
++        for dir in $(echo $TCL_PACKAGE_PATH | sed -e 's/:/ /g'); do
+             if test -r "${dir}/init.tcl" ; then
+                 V_LIBRARY_TCL=$dir
+                 break
+@@ -4845,8 +4845,8 @@ which comes with the PrivateHeaders fold
+ 
+         V_LIBRARY_TK=FAIL
+         TK_PACKAGE_PATH=`echo $TCL_PACKAGE_PATH | sed 's/tcl/tk/g'`
+-        TK_PACKAGE_PATH="$TK_PACKAGE_PATH $TCL_PACKAGE_PATH"
+-        for dir in $TK_PACKAGE_PATH; do
++        TK_PACKAGE_PATH="$TK_PACKAGE_PATH:$TCL_PACKAGE_PATH"
++        for dir in $(echo $TK_PACKAGE_PATH | sed -e 's/:/ /g'); do
+             if test -r "${dir}/tk.tcl" ; then
+                 V_LIBRARY_TK=$dir
+                 break
+@@ -5012,14 +5012,14 @@ if test "$gpl" = "yes" ; then
    if test "$ffmpegco" != "yes"; then
  
        if test "$ffmpeginc" != "" ; then
@@ -47,7 +68,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
                exit 1
           fi
           echo "checking for FFmpeg headers...yes"
-@@ -5028,8 +5028,8 @@
+@@ -5028,8 +5028,8 @@ if test "$gpl" = "yes" ; then
        else
  
           if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
@@ -58,7 +79,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
-@@ -5037,8 +5037,8 @@
+@@ -5037,8 +5037,8 @@ fi
  echo "${ECHO_T}$ac_cv_header_ffmpeg_avcodec_h" >&6; }
  else
    # Is the header compilable?
@@ -69,7 +90,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5046,7 +5046,7 @@
+@@ -5046,7 +5046,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -78,7 +99,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -5078,15 +5078,15 @@
+@@ -5078,15 +5078,15 @@ rm -f core conftest.err conftest.$ac_obj
  echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -97,7 +118,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -5119,30 +5119,30 @@
+@@ -5119,30 +5119,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; 
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -146,7 +167,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_avcodec_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5163,8 +5163,8 @@
+@@ -5163,8 +5163,8 @@ fi
  
  
           if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
@@ -157,7 +178,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
-@@ -5172,8 +5172,8 @@
+@@ -5172,8 +5172,8 @@ fi
  echo "${ECHO_T}$ac_cv_header_ffmpeg_avutil_h" >&6; }
  else
    # Is the header compilable?
@@ -168,7 +189,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5181,7 +5181,7 @@
+@@ -5181,7 +5181,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -177,7 +198,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -5213,15 +5213,15 @@
+@@ -5213,15 +5213,15 @@ rm -f core conftest.err conftest.$ac_obj
  echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -196,7 +217,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -5254,30 +5254,30 @@
+@@ -5254,30 +5254,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; 
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -245,7 +266,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_avutil_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5298,8 +5298,8 @@
+@@ -5298,8 +5298,8 @@ fi
  
  
           if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
@@ -256,7 +277,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
-@@ -5307,8 +5307,8 @@
+@@ -5307,8 +5307,8 @@ fi
  echo "${ECHO_T}$ac_cv_header_ffmpeg_swscale_h" >&6; }
  else
    # Is the header compilable?
@@ -267,7 +288,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5316,7 +5316,7 @@
+@@ -5316,7 +5316,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -276,7 +297,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
-@@ -5348,15 +5348,15 @@
+@@ -5348,15 +5348,15 @@ rm -f core conftest.err conftest.$ac_obj
  echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
@@ -295,7 +316,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  _ACEOF
  if { (ac_try="$ac_cpp conftest.$ac_ext"
  case "(($ac_try" in
-@@ -5389,30 +5389,30 @@
+@@ -5389,30 +5389,30 @@ echo "${ECHO_T}$ac_header_preproc" >&6; 
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -344,7 +365,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  if test "${ac_cv_header_ffmpeg_swscale_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6425,7 +6425,7 @@
+@@ -6425,7 +6425,7 @@ fi
  if test "$v4l2old" = "yes" ; then
                  V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2-old.o"
                echo "Using old Linux grabber-v4l2"
@@ -353,7 +374,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
          if test "${ac_cv_header_libv4lconvert_h+set}" = set; then
    { echo "$as_me:$LINENO: checking for libv4lconvert.h" >&5
  echo $ECHO_N "checking for libv4lconvert.h... $ECHO_C" >&6; }
-@@ -6553,7 +6553,11 @@
+@@ -6553,7 +6553,11 @@ echo "${ECHO_T}$ac_cv_header_libv4lconve
  fi
  if test $ac_cv_header_libv4lconvert_h = yes; then
    V_DEFINE="$V_DEFINE -DHAVE_LIBV4L"
@@ -366,7 +387,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
  else
    V_OBJ_GRABBER="$V_OBJ_GRABBER  video/tinyjpeg.o video/jidctflt.o"
  fi
-@@ -6562,6 +6566,9 @@
+@@ -6562,6 +6566,9 @@ fi
          if test -r /usr/include/linux/videodev2.h  ; then
                  V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o video/grabber-video4linux.o"
                echo "Using Linux Grabbers: Video4Linux2 and Video4Linux1"
@@ -376,7 +397,7 @@ $NetBSD: patch-configure,v 1.2 2015/03/3
          else
                  V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
                echo "Using Linux Grabber: Video4Linux1"
-@@ -6790,8 +6797,9 @@
+@@ -6790,8 +6797,9 @@ sparc-sun-sunos*)
        V_LIB="$V_LIB -lipc"
        ;;
  *-*-netbsd*)

Prev by Date: CVS commit: pkgsrc/databases/mongodb4
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/mongodb4
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index