aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@freebsd.org>2022-10-09 18:34:03 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2022-10-11 09:05:00 +0000
commit9828a78a9c341eb3e1675c2da47db6b7d45c77dc (patch)
treeb4a878f44da8b2f4b71d37997f538e4ad210b821
parentbab68fe712edfa9d0f0e8cb1926f6d629d6f4848 (diff)
downloadports-9828a78a9c341eb3e1675c2da47db6b7d45c77dc.tar.gz
ports-9828a78a9c341eb3e1675c2da47db6b7d45c77dc.zip
cad/abc: Update g20200322 -> g20220920
PR: 266917 260806 Approved by: uddka@student.kit.edu (maintainer's timeout; 9+ months on PR#260806) (cherry picked from commit edd93bd3bac5f41a28f585ee9e0f641f1acb03b2)
-rw-r--r--cad/abc/Makefile4
-rw-r--r--cad/abc/distinfo6
-rw-r--r--cad/abc/files/patch-CMakeLists.txt6
-rw-r--r--cad/abc/files/patch-Makefile12
4 files changed, 14 insertions, 14 deletions
diff --git a/cad/abc/Makefile b/cad/abc/Makefile
index 0506b065fd4c..b566da8b839c 100644
--- a/cad/abc/Makefile
+++ b/cad/abc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= abc
-DISTVERSION= g20200322
+DISTVERSION= g20220920
CATEGORIES= cad
MAINTAINER= uddka@student.kit.edu
@@ -14,7 +14,7 @@ BUILD_DEPENDS= gmake:devel/gmake
USES= cmake
USE_GITHUB= yes
GH_ACCOUNT= berkeley-abc
-GH_TAGNAME= a4518e6f833885c905964f1233d11e5b941ec24c
+GH_TAGNAME= 5fb4912559380dfcb55e76c23d3fa69c0da454f8
USE_LDCONFIG= yes
BINARY_ALIAS= make=${GMAKE}
diff --git a/cad/abc/distinfo b/cad/abc/distinfo
index fd1b1dbf4681..6e2994ad18b2 100644
--- a/cad/abc/distinfo
+++ b/cad/abc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584862926
-SHA256 (berkeley-abc-abc-g20200322-a4518e6f833885c905964f1233d11e5b941ec24c_GH0.tar.gz) = 66d928e01a8652d634cdc8d113ccfb5f79e3160be5fe49da0697845d31754760
-SIZE (berkeley-abc-abc-g20200322-a4518e6f833885c905964f1233d11e5b941ec24c_GH0.tar.gz) = 5760207
+TIMESTAMP = 1665323497
+SHA256 (berkeley-abc-abc-g20220920-5fb4912559380dfcb55e76c23d3fa69c0da454f8_GH0.tar.gz) = 219e6c88cb5129e7bac181feb5f9b92fb715c3c55a4eaa7715c30a53b7867985
+SIZE (berkeley-abc-abc-g20220920-5fb4912559380dfcb55e76c23d3fa69c0da454f8_GH0.tar.gz) = 6065799
diff --git a/cad/abc/files/patch-CMakeLists.txt b/cad/abc/files/patch-CMakeLists.txt
index 2fb22e750965..21f8838d12cb 100644
--- a/cad/abc/files/patch-CMakeLists.txt
+++ b/cad/abc/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2020-03-22 08:33:14 UTC
+--- CMakeLists.txt.orig 2022-09-20 01:47:58 UTC
+++ CMakeLists.txt
-@@ -91,7 +91,7 @@ endfunction()
+@@ -96,7 +96,7 @@ list(REMOVE_ITEM ABC_SRC ${ABC_MAIN_SRC})
set(ABC_MAIN_SRC src/base/main/main.c)
list(REMOVE_ITEM ABC_SRC ${ABC_MAIN_SRC})
@@ -9,7 +9,7 @@
abc_properties(libabc PUBLIC)
set_property(TARGET libabc PROPERTY OUTPUT_NAME abc)
-@@ -99,7 +99,7 @@ add_executable(abc ${ABC_MAIN_SRC})
+@@ -104,7 +104,7 @@ abc_properties(abc PRIVATE)
target_link_libraries(abc PRIVATE libabc)
abc_properties(abc PRIVATE)
diff --git a/cad/abc/files/patch-Makefile b/cad/abc/files/patch-Makefile
index 00f4f66b71df..c2d79f408bba 100644
--- a/cad/abc/files/patch-Makefile
+++ b/cad/abc/files/patch-Makefile
@@ -1,18 +1,18 @@
---- Makefile.orig 2018-03-30 08:04:05 UTC
+--- Makefile.orig 2022-10-09 13:52:58 UTC
+++ Makefile
@@ -1,6 +1,4 @@
-CC := gcc
-CXX := g++
+ AR := ar
LD := $(CXX)
- MSG_PREFIX ?=
-@@ -52,8 +50,6 @@ endif
+@@ -53,8 +51,6 @@ ARCHFLAGS := $(ARCHFLAGS)
+ endif
ARCHFLAGS := $(ARCHFLAGS)
-
--OPTFLAGS ?= -g -O
-
+-OPTFLAGS ?= -g -O
+
CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
ifneq ($(findstring arm,$(shell uname -m)),)
- CFLAGS += -DABC_MEMALIGN=4