From nobody Sun Oct 22 14:45:12 2023 X-Original-To: dev-commits-ports-all@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 4SD1MD6BQJz4xP4y; Sun, 22 Oct 2023 14:45:12 +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 4SD1MD5lyRz4HvR; Sun, 22 Oct 2023 14:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697985912; 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=kv3pnZbOOJNpRzVsAdEPjK/0KUaLV8XKLsjzJeqcyNo=; b=RxOvNlCwscJLQylzrTqbx1qSdQXT7SPTTP5J5CRA5DRNGC1OtGOrnW67vIL+uO4PXvjZ0b vlN3XieMXCP9MirhFdlKJx1RWvllSiaoGUcsCoqDlsHefOJ1dQF0ts9Bmrk7pcok3rVowD fOtzWcgZbiEzgzKOHrCb5MwNuH2HPsktRdPxhyUwe0gncrSVt4+ipQyknNbmaP0lMMlpUH VsoX9RA8Rf+KjpCYQ3lRkiDFcfVe+ynLDFYkiwAo2MMGEwXVEOGuFaw1VOhOzU0Vl62Ifg diwZ5jUmPB9+Pu2q0Gv5cmaCae47dzEZ/Kkd9Fu9B2uHa/LMaevddLQNC4m8FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697985912; a=rsa-sha256; cv=none; b=RHnLs2SQPHQ9hK82xk3HyCugNFp8vQoxwkpGJzZSO+nS+6+XRS0gV63Yos6fOoV01xYay6 2+jpPG7w1tsh+cwTOn/2NGKYuGm3gExUK6jTOPJ738fVyx4coLamUx82Ea/7JPBfYX2kFP OM9AEEEknx26b42vEYgmW2x3wKjsFF1fvz/XbtGxZE5qYjB5r4+1k/WFdi+cRiuKDAQkpG PwI3DjKK6ZIZlsezqyEpIGifPvl80xwr7f79uqid0N2w03FmpuaDUeqePtdBmqLmIEGQXz cIWqCw2/tmgCQUPl3e7VnhU9wgkw9SkCxoPhvpkxcNZ5pAiXSNNeqjNk0gfU4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697985912; 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=kv3pnZbOOJNpRzVsAdEPjK/0KUaLV8XKLsjzJeqcyNo=; b=X1HCWhzjU2ux6mQLrV++sn8uzrJwN/bYYqSYpWYpyp0kiRfLx6pBoSKGtaNc8rfmoINpI2 8gGx/kyd8j7wA9Jqu+VnzPZxIw0xMHMcXUh4XPIACXNf2AcMAs7eG5UTnzWRsIX5UaoF5x pnyul0kEB3EFNcot0knifwiOv/FfeGSA9HkAmar4F2f5fBduBWI64TCivDUikwdUEaOkXl E+CqelKcfYANz19pe5WZ4Kc6D5xyCyfXzYTVccU6PVSCzsx8VrT/+trJ1hpbSxZxd2tn5c jI2gBeVijqqULCs7jcMGMfzE2dyHypyGWAqUD5IfUXWjTOoUEE08TPDfNkV3Xg== 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 4SD1MD4r8Yz11fs; Sun, 22 Oct 2023 14:45:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MEjCqj098888; Sun, 22 Oct 2023 14:45:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MEjCgp098885; Sun, 22 Oct 2023 14:45:12 GMT (envelope-from git) Date: Sun, 22 Oct 2023 14:45:12 GMT Message-Id: <202310221445.39MEjCgp098885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: feb412b3b317 - main - games/xconq: Optionize INFO List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: feb412b3b317ec94fd303ae467c4e0f16d0f19d5 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=feb412b3b317ec94fd303ae467c4e0f16d0f19d5 commit feb412b3b317ec94fd303ae467c4e0f16d0f19d5 Author: Muhammad Moinur Rahman AuthorDate: 2023-10-21 21:10:51 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-10-22 14:45:01 +0000 games/xconq: Optionize INFO - There are info files pregenerated in the distfiles. - Optionize INFO not to regenerate the INFO files for a proper directorycategoty - Pet portclippy --- games/xconq/Makefile | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 4e61ab4bda3a..e84458e0576d 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -10,43 +10,42 @@ WWW= http://xconq.sourceforge.net/ LICENSE= GPLv2+ -OPTIONS_DEFINE= SDL - -USES= compiler gmake makeinfo tar:bzip2 xorg +USES= compiler gmake tar:bzip2 xorg USE_CXXSTD= c++14 USE_XORG= x11 + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-alternate-scoresdir=${SCOREDIR} \ --enable-alternate-gameuser=root \ --enable-alternate-gamegroup=games -CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_clang= -Wno-c++11-narrowing + MAKE_ARGS= GAMEPERM=755 DIRPERM=775 FILEPERM=664 MAKE_JOBS_UNSAFE= yes -PLIST_SUB= SCOREDIR="${SCOREDIR}" - -INFO= xconq +CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +CXXFLAGS_clang= -Wno-c++11-narrowing DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "" "${PORTNAME}" \ "Game;StrategyGame;" false -SCOREDIR?= /var/games/xconq +INFO= xconq +PLIST_SUB= SCOREDIR="${SCOREDIR}" -.include +OPTIONS_DEFINE= SDL INFO +OPTIONS_DEFAULT= INFO -.if ${PORT_OPTIONS:MSDL} -USES+= sdl -USE_SDL= sdl -CONFIGURE_ARGS+=--enable-default-ui=sdl -PLIST_SUB+= NOSDL="@comment " -.else -USES+= tk -USE_XORG+= xext xmu xt xaw -CONFIGURE_ARGS+=--with-tclconfig=${TCL_LIBDIR} \ +INFO_USES= makeinfo +SDL_USES= sdl +SDL_USES_OFF= tk xorg +SDL_USE= SDL=sdl +SDL_USE_OFF= XORG=xext,xmu,xt,xaw +SDL_CONFIGURE_ON=--enable-default-ui=sdl +SDL_CONFIGURE_OFF=--with-tclconfig=${TCL_LIBDIR} \ --with-tkconfig=${TK_LIBDIR} -PLIST_SUB+= NOSDL="" -.endif +SDL_PLIST_SUB= NOSDL="@comment " +SDL_PLIST_SUB_OFF= NOSDL="" + +SCOREDIR?= /var/games/xconq .include @@ -59,23 +58,22 @@ CFLAGS+= -Wno-write-strings post-patch: @${REINPLACE_CMD} -e \ '/^HFLAGS/s| $${debugging}||' ${WRKSRC}/configure -# Fix for gmake >= 3.82 @${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \ ${REINPLACE_CMD} -e 's/^ */ /' -post-build: +post-build-INFO-on: (cd ${WRKSRC}/doc && makeinfo xconq.texi) post-install: ${INSTALL_DATA} ${WRKSRC}/doc/xconq.info \ ${STAGEDIR}${PREFIX}/${INFO_PATH} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xconq -.if empty(PORT_OPTIONS:MSDL) + @${FIND} ${STAGEDIR}${DATADIR} -empty -delete + @${MKDIR} ${STAGEDIR}${SCOREDIR} + +post-install-SDL-off: .for i in imf2x imfapp x2imf ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor -.endif - @${FIND} ${STAGEDIR}${DATADIR} -empty -delete - @${MKDIR} ${STAGEDIR}${SCOREDIR} .include