Hello ports@,

Here's a relatively trivial diff updating classicube to 1.4.0.

Notably, upstream changed their build infra so ALL_TARGET was adjusted
as well as some patches were moved around/adjusted accordingly.

Also, the LibreSSL incompatibility patch that was there previously is
no longer needed. Upstream has done the work to properly support
LibreSSL.

A bit smaller, I broke up one of the lines in the do-install target as
previously it ran on for a tad to long and made portcheck upset.

I also did set the JOBS env var in MAKE_FLAGS (used by upstream's
GNU Make infra) to match MAKE_JOBS (as in ports). Unsure if this is
"correct" or even needed, however.

There *is* a small security change with this update that protects
against blind accepting of some types of invalid PNG data when the
resources are loaded. Not sure about the impact of this, though.
Thought it'd be worth mentioning. Since this is security related, I am
open to providing a diff for this update against -stable as well if
someone would be interested in that.

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..c3ffcdaa8 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.4.0
 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..823e2613d 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.4.0.tar.gz) = jySfQ1/M5NrAg2ZMQwdwc8MsU4Kkhd47zYG63xgWFD8=
+SIZE (ClassiCube-ClassiCube-1.4.0.tar.gz) = 4103267
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;
- 

Reply via email to