Hello ports@
Attached is a diff to update classicube to the latest upstream 1.3.9
Upstream fixed the certificate issue on LibreSSL so I dropped that
patch as well as the FIX_CRLF line for that file.
Upstream also refactored their Makefiles quite a bit so I adjusted the
new place CFLAGS are set with a new patch removing the same -pipe as
before in the old Makefile patch.
I also enabled DEBUG_PACKAGES as upstream has debug symbols enabled by
default. Figured it wouldn't hurt anything and make debug easier in
case any end-user has issues.
I also set JOBS (used in upstream Makefile) to pull from MAKE_JOBS in
case bulk builders try multi-job builds on this port. (I am unsure if
this is the correct way to go about this, so in the case it is not, I
am open to dropping this line from the port Makefile). I tested this
respects MAKE_JOBS by setting it like so:
$ env MAKE_JOBS=6 make
I also noticed portcheck complains about one line being longer than 80
characters, so I made a minor adjustment breaking that line into two
lines to please portcheck.
Tested briefly on amd64 with an i7-3770 and a Radeon PRO WX 3100 (using
the amdgpu(4) driver). Seems to have no major regressions in behavior
on my end. If possible, more ISA platform testing would be appreciated
as I simply don't have the means to test on anything other than amd64
at the current moment. (I'm curious if the BROKEN-riscv6 and
BROKEN-sparc64 can be dropped after this update, in particular)
Anyways, here's the changelog for this release if anyone is curious:
https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.9
Thanks,
--
iz (she/her)
> I say mundane things
> so the uninteresting
> just might get noticed.
izder456 (dot) neocities (dot) org
diff --git a/games/classicube/Makefile b/games/classicube/Makefile
index 275660555..7108979a3 100644
--- a/games/classicube/Makefile
+++ b/games/classicube/Makefile
@@ -3,7 +3,7 @@ BROKEN-sparc64 = ...error "Unknown CPU architecture"
COMMENT = classic Minecraft client written in C
-V = 1.3.8
+V = 1.3.9
PKGNAME = classicube-${V}
DIST_TUPLE += github ClassiCube ClassiCube ${V} .
@@ -20,8 +20,6 @@ WANTLIB += GL X11 Xi c execinfo pthread
# dlopen'd
WANTLIB += openal
-FIX_CRLF_FILES = src/Certs.c
-
COMPILER = base-clang ports-gcc base-gcc
COMPILER_LANGS = c
@@ -33,11 +31,15 @@ USE_GMAKE = Yes
NO_TEST = Yes
-ALL_TARGET = ClassiCube
+MAKE_FLAGS = JOBS=${MAKE_JOBS}
+ALL_TARGET = openbsd
+
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/classicube
- ${INSTALL_PROGRAM} ${WRKSRC}/ClassiCube ${PREFIX}/share/classicube/classicube_run
+ ${INSTALL_PROGRAM} \
+ ${WRKSRC}/ClassiCube ${PREFIX}/share/classicube/classicube_run
${INSTALL_DATA_DIR} ${PREFIX}/share/licenses/classicube
${INSTALL_DATA} ${WRKSRC}/license.txt \
${PREFIX}/share/licenses/classicube/license.txt
diff --git a/games/classicube/distinfo b/games/classicube/distinfo
index d4423aed8..b2f8603bb 100644
--- a/games/classicube/distinfo
+++ b/games/classicube/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ClassiCube-ClassiCube-1.3.8.tar.gz) = NSk6zx5juuyoMt7CUSKD8pdced34DMhVoSwQRkcjpsQ=
-SIZE (ClassiCube-ClassiCube-1.3.8.tar.gz) = 3619343
+SHA256 (ClassiCube-ClassiCube-1.3.9.tar.gz) = W7YtuzrSfh+7CYQvDLH0gCsmhlU7AX4LZ84Js2+QgkY=
+SIZE (ClassiCube-ClassiCube-1.3.9.tar.gz) = 4102339
diff --git a/games/classicube/patches/patch-Makefile b/games/classicube/patches/patch-Makefile
deleted file mode 100644
index 9a2a1d0d8..000000000
--- a/games/classicube/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-honor CFLAGS
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -5,7 +5,7 @@ C_OBJECTS = $(patsubst $(SOURCE_DIR)/%.c, $(BUILD_DI
-
- OBJECTS = $(C_OBJECTS)
- # Flags passed to the C compiler
--CFLAGS = -pipe -fno-math-errno -Werror -Wno-error=missing-braces -Wno-error=strict-aliasing
-+CFLAGS += -fno-math-errno -Werror -Wno-error=missing-braces -Wno-error=strict-aliasing
- # Flags passed to the linker
- LDFLAGS = -g -rdynamic
- # Name of the main executable
diff --git a/games/classicube/patches/patch-misc_makefiles_common_config_mk b/games/classicube/patches/patch-misc_makefiles_common_config_mk
new file mode 100644
index 000000000..34bcb521c
--- /dev/null
+++ b/games/classicube/patches/patch-misc_makefiles_common_config_mk
@@ -0,0 +1,12 @@
+Index: misc/makefiles/common_config.mk
+--- misc/makefiles/common_config.mk.orig
++++ misc/makefiles/common_config.mk
+@@ -2,7 +2,7 @@
+ # Common configurable flags and names
+ #-------------------------------------
+ # Flags passed to the C compiler
+-CFLAGS += -pipe -fno-math-errno -Werror -Wno-error=missing-braces -Wno-error=strict-aliasing
++CFLAGS += -fno-math-errno -Werror -Wno-error=missing-braces -Wno-error=strict-aliasing
+ # Flags passed to the linker
+ #LDFLAGS +=
+ # Libraries to link against
diff --git a/games/classicube/patches/patch-src_Certs_c b/games/classicube/patches/patch-src_Certs_c
deleted file mode 100644
index 2545a438e..000000000
--- a/games/classicube/patches/patch-src_Certs_c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/Certs.c
---- src/Certs.c.orig
-+++ src/Certs.c
-@@ -97,6 +97,13 @@ static const cc_string cryptoLib = String_FromConst("l
- static const cc_string cryptoAlt = String_FromConst("libcrypto.so.3");
- #endif
-
-+#ifdef CC_BUILD_OPENBSD
-+ /* OpenBSD usually uses LibreSSL instead of OpenSSL, which didn't rename these symbols */
-+ #define OPENSSL_sk_new_null sk_new_null
-+ #define OPENSSL_sk_push sk_push
-+ #define OPENSSL_sk_pop_free sk_pop_free
-+#endif
-+
- static X509_STORE* store;
- static cc_bool ossl_loaded;
-
