From nobody Thu Nov 24 16:16:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NJ36F29R1z4hXn7; Thu, 24 Nov 2022 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NJ36F1fxcz3LFc; Thu, 24 Nov 2022 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669306613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7JjWdz/BkipHKdkaqRC/bChjGyJiYhuwJih2r7TDzQ=; b=nccN3jfrVQwsivAdCqUS9KWZqSUsKAAMPqeObkLwNBM01sS0ktqI+XFLdTx5uqXwFIRPOo c5MGZF3E4+AUihcJ8l+STxgQjZsEjtIaWer1BBwFLarOWZW/p6qZZqlzbQwrKZmCQzQumj FCjQvIRlsB1nf0bJALLEF5FJMINpXVS6htNCCWJ3AdU4pvAs7jdgsc5GvD1BC66hn00oso 6boILm6ZVT93frnX5yl90nNnIuitJVid+8sAzUVtYBjL3YgtnWEFwZG/KGk3z+x1aveMEF lLBe4rBZBkLKDRZuH6GELM+KgsZXGIOrInDerl+C9Kpsxkyu3HXvqrLmQSq9Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669306613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7JjWdz/BkipHKdkaqRC/bChjGyJiYhuwJih2r7TDzQ=; b=w9/DjiJx3Q3haA8vHhnTyuhULww6H6lhYdoA2NSlU1RVobO4WP3UrTalz6TRIi1q1BKkts 9oVkPKpGSMYEs4/NMYCW1lrQjedCuLEC7HlNx4EnQ9bmCb2qxQv/tRgpAEIQJLZoXK1Uz8 49A8EYaGhycADMOxdB73vvKrdCqH2PYb7hPHoKy3Zdd+CMnFcxhOUgG9dk2G+uijEY7V8d +yrM5j/kCq0NPEN8YSzvz1XIDGM5dm/vuOaVaadu7td2dTtU19tpreLhquJ9e43qgUZPO5 3FmZDqM4oNU3sawpcGbTnk9pdjcCW7zJYru98sapC31I9SJI8X4Wf5KrvKDJgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669306613; a=rsa-sha256; cv=none; b=SsVWHlYq5SPCbOykntcqZpPU8ayhhl12eeeQElzCSf2yM1hV3CYkm48svViUEhAmCLj7av LTyi2ILb0IBf5GhM/qv1YkelsDj4D10UWYe6yOAs+qej2fdunhoAW7b0TCrpz97rcOqqUW p/LhrGuHsO9x29plojrhKlO2/tbOFXw7l14PqU4Q8nZqjPJlSSYVFrkwJ+oCHwEEB88fRY LilC0SlnkXaVxRMaSLIlNYrzJWVWgDkbQ5r+Gds4o1Oa0sKoD6gRfCa9zPJRSIS9M2b66N NDcjdyV8CczpoTyhPw3nVMgCoRo9tmJdt5IfRUXXlv+40Ofrz9RQM+3Jvhxupw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NJ36F0hMkz174W; Thu, 24 Nov 2022 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AOGGq5F009848; Thu, 24 Nov 2022 16:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AOGGqLD009847; Thu, 24 Nov 2022 16:16:52 GMT (envelope-from git) Date: Thu, 24 Nov 2022 16:16:52 GMT Message-Id: <202211241616.2AOGGqLD009847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: bed6f6f7e19c - main - games/oblige: use the ports instead of bundled 3rd-party components List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bed6f6f7e19c1d6e194fdf8a73ad30881afa49b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bed6f6f7e19c1d6e194fdf8a73ad30881afa49b6 commit bed6f6f7e19c1d6e194fdf8a73ad30881afa49b6 Author: Alexey Dokuchaev AuthorDate: 2022-11-24 16:16:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-24 16:16:32 +0000 games/oblige: use the ports instead of bundled 3rd-party components Unfortunately, we cannot get rid of bundled Lua just yet as none of the Lua versions we have can digest the project's *.lua scripts. --- games/oblige/Makefile | 10 ++++++++-- games/oblige/files/patch-Makefile | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/games/oblige/Makefile b/games/oblige/Makefile index ae7f2d062159..74f02ca32b60 100644 --- a/games/oblige/Makefile +++ b/games/oblige/Makefile @@ -10,19 +10,23 @@ WWW= https://oblige.sourceforge.net/ LICENSE= GPLv2+ +BUILD_DEPENDS= ${LOCALBASE}/include/glbsp.h:games/glbsp LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ + libphysfs.so:devel/physfs \ libpng.so:graphics/png USES= gmake jpeg xorg zip USE_XORG= x11 xcursor xext xfixes xft xinerama xrender -MAKE_ARGS= CXX="${CXX}" WRKSRC= ${WRKDIR}/Oblige-${PORTVERSION}-source OPTIONS_DEFINE= DOCS PORTDOCS= AUTHORS.txt CHANGES.txt README.txt TODO.txt +post-extract: + @cd ${WRKSRC} && ${RM} -r glbsp_src physfs_src + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Oblige ${STAGEDIR}${PREFIX}/bin/oblige cd ${WRKSRC} && ${COPYTREE_SHARE} "addons data engines games \ @@ -35,9 +39,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/icon_128x128.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/oblige.png -post-install-DOCS-on: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${COPYTREE_SHARE} changelogs ${STAGEDIR}${DOCSDIR} .include + +PATCH_ARGS+= -l diff --git a/games/oblige/files/patch-Makefile b/games/oblige/files/patch-Makefile new file mode 100644 index 000000000000..920f47b4f42c --- /dev/null +++ b/games/oblige/files/patch-Makefile @@ -0,0 +1,41 @@ +--- Makefile.orig 2018-01-09 05:01:02 UTC ++++ Makefile +@@ -17,7 +17,7 @@ SCRIPT_DIR=$(PREFIX)/share/oblige + + SCRIPT_DIR=$(PREFIX)/share/oblige + +-CXX=g++ ++CXX?=c++ + + OBJ_DIR=obj_linux + +@@ -34,9 +34,9 @@ FLTK_LIBS=$(shell $(FLTK_CONFIG) --use-images --ldflag + FLTK_FLAGS=$(shell $(FLTK_CONFIG) --cflags) + FLTK_LIBS=$(shell $(FLTK_CONFIG) --use-images --ldflags) + +-CXXFLAGS=$(OPTIMISE) -Wall -D$(OS) -Ilua_src -Iglbsp_src -Iajpoly_src -Iphysfs_src $(FLTK_FLAGS) ++CXXFLAGS=$(OPTIMISE) -Wall -D$(OS) -Ilua_src -Iajpoly_src $(FLTK_FLAGS) + LDFLAGS=-L/usr/X11R6/lib +-LIBS=-lm -lz $(FLTK_LIBS) ++LIBS=-lm -lz -lglbsp -lphysfs $(FLTK_LIBS) + + + #----- OBLIGE Objects ---------------------------------------------- +@@ -174,7 +174,7 @@ AJPOLY_OBJS= \ + $(OBJ_DIR)/ajpoly/pl_util.o \ + $(OBJ_DIR)/ajpoly/pl_wad.o + +-AJPOLY_CXXFLAGS=$(OPTIMISE) -Wall -Iphysfs_src ++AJPOLY_CXXFLAGS=$(OPTIMISE) -Wall -I$(LOCALBASE)/include + + $(OBJ_DIR)/ajpoly/%.o: ajpoly_src/%.cc + $(CXX) $(AJPOLY_CXXFLAGS) -o $@ -c $< +@@ -212,7 +212,7 @@ all: $(PROGRAM) + + all: $(PROGRAM) + +-$(PROGRAM): $(OBJS) $(LUA_OBJS) $(GLBSP_OBJS) $(AJPOLY_OBJS) $(PHYSFS_OBJS) ++$(PROGRAM): $(OBJS) $(LUA_OBJS) $(AJPOLY_OBJS) + $(CXX) -Wl,--warn-common $^ -o $@ $(LDFLAGS) $(LIBS) + + clean: