From nobody Wed Mar 16 13:22:42 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 085101A26B6D; Wed, 16 Mar 2022 13:22:43 +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 4KJWD26Zfyz4rvL; Wed, 16 Mar 2022 13:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647436963; 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=PFQQGNQY7nG8u380gXqlx+zXugFBgZGxIUCODl/MTUI=; b=jIInS3jeQrLg2+iY7oSGizdkD6NxAYX6Yz1aUEkbliPDgImozjllSRTSavMFSlpC2siMHf Q92ikz+wWdfDHVb0x3U9zKWM3EwXWCm8amk9FWlnPe+SwyFLXGk3a1Zakbxf5Gg0ls0d7t 9ZO2LoRXGzc7fGgp2bt9dUZRR5eNvwDp43QrUPOq631odg8kfsALZpo2If3RQKitOCZNow E1ZdjCDHFdh5YaWlk6OIV+uNBrSt+Px/BOtpCXfv9UTbH/3nbECuzt8KBW1wuHsuMXKZrI jSxcKgS1uSZMY9dbcvwDa/lM8UN/nSSA+PZe4qmUQ9SFfrXDZ4E/V1Vk3EACzw== 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 BA65B16DDA; Wed, 16 Mar 2022 13:22:42 +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 22GDMgxP022056; Wed, 16 Mar 2022 13:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GDMgeF022055; Wed, 16 Mar 2022 13:22:42 GMT (envelope-from git) Date: Wed, 16 Mar 2022 13:22:42 GMT Message-Id: <202203161322.22GDMgeF022055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 7d9649083431 - main - =?utf-8?Q?graphics/geomorph: update 0.60.1 =E2=86=92 0.63?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d96490834314e7e5853222464b25c792a46789c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647436963; 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=PFQQGNQY7nG8u380gXqlx+zXugFBgZGxIUCODl/MTUI=; b=ZXeQef6Y4Ua6Sp4TiCj5zXQhZaBSuUq3uUXyHTuPGyKaI9MEwHuruoIA0fIq7CsTvh90uO CBPBv+HXosTK2q7B+s7CXczRNKBURwtUMWZK5rJxap8u1UuoX6YRKOLDkPTftcWa6cKzhW Lfick4mvRkirjuw47dZx++Fqa66wR1oqOVVxtkqCy1xowTpJRMADeQQlSXsruv7/tYwQp8 a2EAV47HtZZIa4RKcr0E5A+BnSAXySSUZAAULBMI59HOmjZQLX7X0szIoVUKQptETbOSNi jBXE3xqo84TRWDSkvAt8g9qzRYi2SdQTn/wqakk423WLFl5F5JwqehSwdeRFPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647436963; a=rsa-sha256; cv=none; b=oVw2/JzjAGJTpDEvBnUcSiEXUaQUb/6voDsAya/QSE7xlfULk4yzzyjr+lJxK4bvWj5LF4 DwvhmILRXydezWvgs6Rdz885xFvlNLrWCNz9lx0x1LAwt7Bg7disvmIMtApccIUTI+hBuH Bmf9WIQnACggLrD2Vl+RXyL42DgtJAX/1TzK+zPHeWE/Dw1szFE2ynrVUxyaTP4p7MDpWs pCL93hPXtCVO/dqd44v/e7XNoLYf1pih+Fi0hFhC6sLPIWWTD15vNugV7K8Yge0A1/ckJK PmGumlpLFaU0eDO6zVpMtpdzXmL/ErumDNSSt/pESQVqzvFGaSOT2iYwkITYBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d96490834314e7e5853222464b25c792a46789c commit 7d96490834314e7e5853222464b25c792a46789c Author: Dmitry Marakasov AuthorDate: 2022-03-15 18:57:10 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-16 12:52:06 +0000 graphics/geomorph: update 0.60.1 → 0.63 --- graphics/geomorph/Makefile | 23 +++--- graphics/geomorph/distinfo | 5 +- graphics/geomorph/files/patch-src-hf-view__area.c | 10 --- .../{patch-src-app-main.c => patch-src_app_main.c} | 83 ++++++++++++---------- 4 files changed, 59 insertions(+), 62 deletions(-) diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile index f3b3ad68fa96..2b69e28970d4 100644 --- a/graphics/geomorph/Makefile +++ b/graphics/geomorph/Makefile @@ -1,8 +1,7 @@ PORTNAME= geomorph -PORTVERSION= 0.60.1 -PORTREVISION= 12 +PORTVERSION= 0.63 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.60/ +MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Height field generator and editor @@ -10,31 +9,33 @@ COMMENT= Height field generator and editor LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libpng.so:graphics/png -USES= compiler:c++11-lang desktop-file-utils gl gmake pkgconfig \ - shebangfix +USES= autoreconf compiler:c++11-lang desktop-file-utils \ + gl gmake gnome libtool pkgconfig shebangfix SHEBANG_FILES= update-rc +USE_GNOME= gtk20 USE_GL= gl glu GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libintl-prefix="${LOCALBASE}" -USE_GCC= yes # lots of severely broken code CFLAGS+= -fcommon -PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDATA= * OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext +NLS_USES_OFF= gettext-tools NLS_CONFIGURE_ENABLE= nls +pre-build: +# rebuild bundled linux binary + cd ${WRKSRC}/scenes && ${RM} colman && ${CC} ${CFLAGS} ${LDFLAGS} -o colmap colmap.c + post-patch: @${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -i '' -e 's|/usr/local/share/geomorph|${DATADIR}|' {} \; - @${REINPLACE_CMD} -e 's|\$$HOME/geomorph|\$$HOME/.geomorph|' \ + @${REINPLACE_CMD} -i '' -e 's|\$$HOME/geomorph|\$$HOME/.geomorph|' \ ${WRKSRC}/install-step* ${WRKSRC}/install-user ${WRKSRC}/update-rc - @${REINPLACE_CMD} -e '/DEF_DIR_NAME/ s|geomorph|.geomorph|' \ + @${REINPLACE_CMD} -i '' -e '/DEF_DIR_NAME/ s|geomorph|.geomorph|' \ ${WRKSRC}/src/app/globals.h ${WRKSRC}/src/hf/globals.h - @${FIND} ${WRKSRC} -name "*.bak" -delete post-install: ${INSTALL_DATA} ${WRKSRC}/geomorph.desktop ${STAGEDIR}${PREFIX}/share/applications/ diff --git a/graphics/geomorph/distinfo b/graphics/geomorph/distinfo index 839d16259076..4a4cf3f7fd24 100644 --- a/graphics/geomorph/distinfo +++ b/graphics/geomorph/distinfo @@ -1,2 +1,3 @@ -SHA256 (geomorph-0.60.1.tar.gz) = 47cdda8c778d5260362d71adfa52eaf556b4f0dfc169c65fa6c809e216c5d572 -SIZE (geomorph-0.60.1.tar.gz) = 749579 +TIMESTAMP = 1647369368 +SHA256 (geomorph-0.63.tar.gz) = 2ec33e57cb75d830a4da75f706dc275c72faf03b2422c841d5845c8adefde904 +SIZE (geomorph-0.63.tar.gz) = 983783 diff --git a/graphics/geomorph/files/patch-src-hf-view__area.c b/graphics/geomorph/files/patch-src-hf-view__area.c deleted file mode 100644 index d17e1b570a2d..000000000000 --- a/graphics/geomorph/files/patch-src-hf-view__area.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/hf/view_area.c.orig 2010-07-31 07:31:37.000000000 +0400 -+++ src/hf/view_area.c 2013-12-24 08:09:42.420751997 +0400 -@@ -20,6 +20,7 @@ - - // Modified 2005-01-09 for removing double buffering (now auto with GTK2) PSTG - -+#include "../utils/x_alloc.h" - #include "view_area.h" - #include - #include diff --git a/graphics/geomorph/files/patch-src-app-main.c b/graphics/geomorph/files/patch-src_app_main.c similarity index 61% rename from graphics/geomorph/files/patch-src-app-main.c rename to graphics/geomorph/files/patch-src_app_main.c index f2efd5de2a6d..c45affce21f6 100644 --- a/graphics/geomorph/files/patch-src-app-main.c +++ b/graphics/geomorph/files/patch-src_app_main.c @@ -1,46 +1,50 @@ ---- src/app/main.c.orig 2010-10-30 08:17:00.000000000 +0400 -+++ src/app/main.c 2013-08-28 03:51:05.535226256 +0400 -@@ -18,6 +18,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ +--- src/app/main.c.orig 2021-01-31 03:36:55 UTC ++++ src/app/main.c +@@ -75,87 +75,22 @@ gchar *find_config_file() { + gboolean shortcuts; + glong pathmax; -+#include - #include "./main.h" - #include "./globals.h" - #include "./app.h" -@@ -68,6 +69,12 @@ - if (command) x_free(command); - } - -+char *get_current_dir_name() { -+ char *buf = malloc(MAXPATHLEN); -+ getwd(buf); -+ return buf; -+} -+ - gchar *find_config_file() { - // Returns the config file name (name OPTION_FILE, defined in globals.h), - // with its full path -@@ -83,59 +90,23 @@ - // if $HOME/DEF_DIR_NAME doesn't exist, we create the required files - // The directory where OPTION_FILE is found becomes the default one (DEF_DIR) +-// We try: +-// 1. in the current directory. (./OPTION_FILE = ./geomorphrc) +-// 2. if not found, we try ./DEF_DIR_NAME/OPTION_FILE (./geomorph/geomorphrc) +-// 3. if not found, we try $HOME/OPTION_FILE (~/geomorphrc) +-// 4. if not found, we try in $HOME/DEF_DIR_NAME (~/geomorph/geomorphrc) +-// --> if OPTION_FILE was not found, and +-// if $HOME/DEF_DIR_NAME doesn't exist, we create the required files +-// The directory where OPTION_FILE is found becomes the default one (DEF_DIR) ++ default_dir = concat_dname_fname(getenv("HOME"), DEF_DIR_NAME); ++ path_n_file = path_n_file = concat_dname_fname(default_dir, OPTION_FILE); - // Try ./OPTION_FILE -- default_dir = (gchar *) get_current_dir_name(); -- path_n_file = concat_dname_fname(default_dir,OPTION_FILE); +- pathmax = get_pathmax(); +- default_dir = (gchar *) x_malloc(pathmax*sizeof(gchar),"gchar - default_dir in main.c"); +- dummy = (gchar *) getcwd(default_dir,pathmax); +-// printf("Dummy: %p; Current dir name for config file: %p;\n", dummy, default_dir); +- path_n_file = concat_dname_fname(dummy,OPTION_FILE); - if (!filexists(path_n_file)) { // Try ./DEF_DIR_NAME/OPTION_FILE -- default_dir = concat_dname_fname(default_dir,DEF_DIR_NAME); +- dummy = default_dir; +- default_dir = concat_dname_fname(dummy,DEF_DIR_NAME); +- x_free(dummy); +- dummy = NULL; - if (path_n_file) - x_free(path_n_file); - path_n_file = concat_dname_fname(default_dir,OPTION_FILE); - if (!filexists(path_n_file)) { // Try in the home directory - ~/OPTION_FILE +- x_free(default_dir); +-#ifdef _WIN32 +- default_dir = get_windows_home(); +-#else - default_dir = getenv("HOME"); +-#endif - if (path_n_file) - x_free(path_n_file); - path_n_file = concat_dname_fname(default_dir, OPTION_FILE); - if (!filexists(path_n_file)) { // Try ~/DEFAULT_DIR/OPTION_FILE -- default_dir = concat_dname_fname(default_dir,DEF_DIR_NAME); -- if (path_n_file) x_free(path_n_file); +- dummy = default_dir; +- default_dir = concat_dname_fname(dummy,DEF_DIR_NAME); +- // Here we don't free dummy because it comes from getenv +- if (path_n_file) +- x_free(path_n_file); - path_n_file = concat_dname_fname(default_dir, OPTION_FILE); - if (directory_exists(default_dir)) { - if (!filexists(path_n_file)) { @@ -52,7 +56,7 @@ - // Geomorph directory ("default_dir") doesn't exist - // Create one with default scenes and rc file - buf = (gchar *) x_malloc(strlen(_("Creation of the default working directory?"))+1+strlen(default_dir), "const gchar (buf - Creation of the default working directory MSG)"); -- sprintf(buf,_("Creation of the default working directory?"),default_dir); +- sprintf(buf,_("Creation of the default working directory %s?"),default_dir); - if (!yes_no(buf,TRUE)) - exit(0); -// if (buf) x_free(buf); @@ -76,23 +80,24 @@ - if (path_n_file) x_free(path_n_file); - } - } -+ default_dir = concat_dname_fname(getenv("HOME"), DEF_DIR_NAME); -+ path_n_file = path_n_file = concat_dname_fname(default_dir, OPTION_FILE); -+ + if (directory_exists(default_dir)) { + if (!filexists(path_n_file)) { -+ // Big problem, create a default rc file + create_config_file(path_n_file); } - } -+ else { ++ } else { + command = concat_dname_fname(get_data_dir(),"install-step1-dir"); + if (system(command)) + my_msg(_("Fatal error during the creation of the default working directory"),ABORT); + if (command) free(command); + create_config_file(path_n_file); -+ } + } +- dummy = default_dir; +- default_dir = add_filesep(dummy); +- if (dummy != default_dir) +- x_free(dummy); +- return default_dir; + if (path_n_file) free(path_n_file); - return add_filesep(default_dir); ++ return add_filesep(default_dir); } + int main( int argc,