pkgsrc-WIP-changes archive

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

kermit: Fix build on macos, adjusting for upstream changes since previous.



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Aug 29 20:25:55 2022 -0400
Changeset:	6ef4026858529edd300d164309ba73f90af0daec

Modified Files:
	kermit/Makefile
	kermit/options.mk

Log Message:
kermit: Fix build on macos, adjusting for upstream changes since previous.

  - Don't use ssl on mac, because it seems not really available.
  - Note that support for non-standard MANDIR is missing.
  - Accomodate new mac targets in upstream makefile, but don't try to
    make anything older than 10.12 work.  (Patch/fix welcome.)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6ef4026858529edd300d164309ba73f90af0daec

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

diffstat:
 kermit/Makefile   | 15 ++++-----------
 kermit/options.mk |  7 ++++++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diffs:
diff --git a/kermit/Makefile b/kermit/Makefile
index 5173c7b4a8..8961632922 100644
--- a/kermit/Makefile
+++ b/kermit/Makefile
@@ -24,6 +24,8 @@ BUILD_DEFS+=	KFLAGS LIBS
 MAKE_ENV+=	prefix=${PREFIX} KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
 MAKE_FILE=	makefile
 
+# \todo Enhance for non-standard mandir.
+
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
 KFLAGS+=	${BUILDLINK_CPPFLAGS}
 
@@ -36,17 +38,8 @@ LIBS+=		${BUILDLINK_LDFLAGS}
 .include "../../mk/termcap.buildlink3.mk"
 
 .if ${OPSYS} == "Darwin"
-.  if !empty(OS_VERSION:M??.*)
-BUILD_TARGET_OPSYS=	macosx10.6
-.  elif !empty(OS_VERSION:M9.*)
-BUILD_TARGET_OPSYS=	macosx10.5
-.  elif !empty(OS_VERSION:M8.*)
-BUILD_TARGET_OPSYS=	macosx10.4
-.  elif empty(OS_VERSION:M7.*)
-BUILD_TARGET_OPSYS=	macosx103.9
-.  else
-BUILD_TARGET_OPSYS=	macosx10
-.  endif
+# Assume >= 10.12 for now.
+BUILD_TARGET_OPSYS=	macos
 .elif ${OPSYS} == "Linux"
 BUILD_TARGET_OPSYS=	linux
 MAKE_ENV+=		HAVE_LIBCURSES=-l${BUILDLINK_LIBNAME.curses}
diff --git a/kermit/options.mk b/kermit/options.mk
index f48ee20b0f..c15efe135f 100644
--- a/kermit/options.mk
+++ b/kermit/options.mk
@@ -1,7 +1,12 @@
 # $NetBSD: options.mk,v 1.6 2015/09/30 08:25:37 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.kermit
-PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp ssl kerberos
+PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp kerberos
+.if ${OPSYS} != "Darwin"
+# ssl without krb5 is not supported on Darwin, and ssl+krb5 is marked
+# experimental.  Avoid for now.
+SSL_TARGET=	ssl
+.endif
 PKG_OPTIONS_OPTIONAL_GROUPS+=	socks
 PKG_OPTIONS_GROUP.socks=	socks4 dante
 


Home | Main Index | Thread Index | Old Index