CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 30 10:50:43 UTC 2025

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

Log Message:
mk: revert previous

Please don't touch this again without discussion first.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mk/jpeg.buildlink3.mk

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.9 pkgsrc/mk/jpeg.buildlink3.mk:1.10
--- pkgsrc/mk/jpeg.buildlink3.mk:1.9    Wed Apr 30 10:44:35 2025
+++ pkgsrc/mk/jpeg.buildlink3.mk        Wed Apr 30 10:50:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: jpeg.buildlink3.mk,v 1.9 2025/04/30 10:44:35 nia Exp $
+# $NetBSD: jpeg.buildlink3.mk,v 1.10 2025/04/30 10:50:43 wiz Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a libjpeg implementation.  jpeg.buildlink3.mk will:
@@ -28,11 +28,7 @@ MK_JPEG_BUILDLINK3_MK:=      ${MK_JPEG_BUILDL
 #
 _JPEG_PKGS?=   jpeg libjpeg-turbo
 
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"
-JPEG_DEFAULT?= libjpeg-turbo
-.else
 JPEG_DEFAULT?= jpeg
-.endif
 JPEG_ACCEPTED?=        ${_JPEG_PKGS}
 
 _JPEG_DEFAULT= ${JPEG_DEFAULT}