CVS commit: pkgsrc/devel/gnustep-objc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 20 14:34:01 UTC 2025

Modified Files:
        pkgsrc/devel/gnustep-objc: Makefile buildlink3.mk

Log Message:
gnustep-objc: simplify a lot, convert to cmake/build.mk

unbump ABI & API for now until it's confirmed it's needed


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/gnustep-objc/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/gnustep-objc/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/devel/gnustep-objc/Makefile
diff -u pkgsrc/devel/gnustep-objc/Makefile:1.41 pkgsrc/devel/gnustep-objc/Makefile:1.42
--- pkgsrc/devel/gnustep-objc/Makefile:1.41     Thu Feb 20 14:24:02 2025
+++ pkgsrc/devel/gnustep-objc/Makefile  Thu Feb 20 14:34:01 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2025/02/20 14:24:02 manu Exp $
+# $NetBSD: Makefile,v 1.42 2025/02/20 14:34:01 wiz Exp $
 
 DISTNAME=      libobjc2-2.2.1
 PKGNAME=       ${DISTNAME:S/libobjc2/gnustep-objc/}
-PKGREVISION=   1
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnustep/}
 GITHUB_PROJECT=        libobjc2
@@ -15,17 +14,11 @@ LICENSE=    mit
 
 TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang
 
-USE_LANGUAGES=                 objc c++11
-USE_TOOLS+=                    gmake cmake pax
-USE_CMAKE=                     yes
-LDFLAGS+=                      -lm -lunwind -lstdc++
-MAKE_FILE=                     Makefile
-MAKE_ENV+=                     ADDITIONAL_LDFLAGS="-lpthread"
-MAKE_ENV+=                     LIBOBJC=libobjc
-MAKE_ENV+=                     LIBOBJCXX=libobjcxx
-MAKE_ENV+=                     VERSION=4.6
-MAKE_ENV+=                     MAJOR_VERSION=4
-MAKE_ENV+=                     MINOR_VERSION=6
+USE_LANGUAGES=                 objc c++
+USE_TOOLS+=                    pax
+USE_CXX_FEATURES+=             c++11
+
+CMAKE_CONFIGURE_ARGS+=         -Wno-dev
 
 INSTALLATION_DIRS=             lib include/objc
 
@@ -33,17 +26,13 @@ post-extract:
        cd ${BUILDLINK_PREFIX.robin-map} && \
            pax -rwpam include/tsl ${WRKSRC}/third_party/robin-map/
 
-do-configure:
-       cd ${WRKSRC} && \
-               ${SETENV} ${CONFIGURE_ENV} ${CMAKE} -Wno-dev ${CMAKE_ARGS} .
-
 .include "../../mk/compiler.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
 # Building tests with GCC is not supported.
-.if empty(CC_VERSION:Mclang-*)
-CMAKE_ARGS+=   -DTESTS:BOOL=FALSE
+.if !${CC_VERSION:Mclang-*}
+CMAKE_CONFIGURE_ARGS+= -DTESTS:BOOL=FALSE
 .endif
 
 PLIST_VARS+=   objcxx
@@ -51,6 +40,7 @@ PLIST_VARS+=  objcxx
 PLIST.objcxx=  yes
 .endif
 
+.include "../../devel/cmake/build.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/robin-map/buildlink3.mk"
 .include "../../lang/libunwind/buildlink3.mk"

Index: pkgsrc/devel/gnustep-objc/buildlink3.mk
diff -u pkgsrc/devel/gnustep-objc/buildlink3.mk:1.16 pkgsrc/devel/gnustep-objc/buildlink3.mk:1.17
--- pkgsrc/devel/gnustep-objc/buildlink3.mk:1.16        Thu Feb 20 14:24:02 2025
+++ pkgsrc/devel/gnustep-objc/buildlink3.mk     Thu Feb 20 14:34:01 2025
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.16 2025/02/20 14:24:02 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2025/02/20 14:34:01 wiz Exp $
 
 BUILDLINK_TREE+=       gnustep-objc
 
 .if !defined(GNUSTEP_OBJC_BUILDLINK3_MK)
 GNUSTEP_OBJC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-objc+=   gnustep-objc>=2.2.1
-BUILDLINK_ABI_DEPENDS.gnustep-objc+=   gnustep-objc>=2.2.1
+BUILDLINK_API_DEPENDS.gnustep-objc+=   gnustep-objc>=1.3.0
+BUILDLINK_ABI_DEPENDS.gnustep-objc+=   gnustep-objc>=1.3.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc?=     ../../devel/gnustep-objc
 
 BUILDLINK_CFLAGS.gnustep-objc+=                -I${BUILDLINK_PREFIX.gnustep-objc}/include/objc