CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May  7 09:11:35 UTC 2025

Modified Files:
        pkgsrc/mk: jpeg.buildlink3.mk
        pkgsrc/mk/defaults: mk.conf

Log Message:
mk: Move JPEG_DEFAULT definition to bsd.prefs.mk.

Allows it to be used to determine SUPERSEDES logic in the jpeg packages
themselves.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mk/jpeg.buildlink3.mk
cvs rdiff -u -r1.350 -r1.351 pkgsrc/mk/defaults/mk.conf

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

Modified files:

Index: pkgsrc/mk/jpeg.buildlink3.mk
diff -u pkgsrc/mk/jpeg.buildlink3.mk:1.11 pkgsrc/mk/jpeg.buildlink3.mk:1.12
--- pkgsrc/mk/jpeg.buildlink3.mk:1.11   Wed Apr 30 10:51:32 2025
+++ pkgsrc/mk/jpeg.buildlink3.mk        Wed May  7 09:11:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: jpeg.buildlink3.mk,v 1.11 2025/04/30 10:51:32 wiz Exp $
+# $NetBSD: jpeg.buildlink3.mk,v 1.12 2025/05/07 09:11:34 jperkin Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a libjpeg implementation.  jpeg.buildlink3.mk will:
@@ -28,7 +28,6 @@ MK_JPEG_BUILDLINK3_MK:=       ${MK_JPEG_BUILDL
 #
 _JPEG_PKGS?=   jpeg libjpeg-turbo
 
-JPEG_DEFAULT?= libjpeg-turbo
 JPEG_ACCEPTED?=        ${_JPEG_PKGS}
 
 _JPEG_DEFAULT= ${JPEG_DEFAULT}

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.350 pkgsrc/mk/defaults/mk.conf:1.351
--- pkgsrc/mk/defaults/mk.conf:1.350    Wed Apr 30 22:04:43 2025
+++ pkgsrc/mk/defaults/mk.conf  Wed May  7 09:11:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.350 2025/04/30 22:04:43 gutteridge Exp $
+# $NetBSD: mk.conf,v 1.351 2025/05/07 09:11:34 jperkin Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1251,6 +1251,11 @@ JABBERD_PIDDIR?= ${VARBASE}/run/jabberd
 # Possible: any directory
 # Default: ${VARBASE}/run/jabberd
 
+JPEG_DEFAULT?= libjpeg-turbo
+# Default libjpeg implementation to use.
+# Possible: jpeg libjpeg-turbo
+# Default: libjpeg-turbo
+
 #KERBEROS=
 # Used in many packages to specify use of a Kerberos (or compatible)
 # subsystem.  Requires Kerberos libraries in /usr/lib.