From nobody Sat Mar 02 15:35:34 2024 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 4Tn8DQ4Chfz5CRGj; Sat, 2 Mar 2024 15:35:34 +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 4Tn8DQ3n2kz435k; Sat, 2 Mar 2024 15:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709393734; 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=OeuWbhiOpiX+rteucsoKiDHSE6YhwcZtItGVlntVTaY=; b=JnpRb0xbYG7Y8Y2H7KThW6c9R8jo5UlWmOvUKu0gmEQEkzkPTW9C7VSkNzY1c8f/k1AqsI PgJBWr0N+vDKeJs00gLjv7VYgMcHcx1oCQu8nrWAgxDF30ZHhaex9IBcgA+qsVQoYz9Xc7 EMrtzWBCkAhdpUfpbLHBKIsqg0KuNtacYwRXaXro978s+6oAs5DqNt3XhncxMKCZk+I3oh QJoukKYUXZ83gh1MiWZPABCOTiqq8NZm6OTNYC9UL3y5V7Lhuwz+X5JjDRkyp7LItkV9k/ xdXCNYqo/QMTbV0u9RwUqeC3BS7B4ockXRJph8VWabRF8dc69Yqz/Vcp6UvhVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709393734; a=rsa-sha256; cv=none; b=s70WlYh3yY0MgcOckxCYmdKbLk0HS+66wU1J26hvVrbxxA/FaKU7TedCf1T9N8BEO7TRZ/ Uk0WvSdfka5sMeJS5XkwLW/sQyYK17exffaNvXl5PFYfZd+L8pe3uaybhywBIg71TUlRgi iK+1aqGsl2zUOSPjeXaJzHQuU3DNyMWmTguewUO/EOYG0PcsEZ+E/gVE2WhYC7byYH3sPN ex6uNgDmo+xo/j8izx9j6B/GqolowQgBnJfDAO14zQ8rFNowH1HLxJroab/eQ5URzMTYqG dBztcjG0WWeUACKKpEP1isOuAS/auEjKGr2PqzSYcH8EvWP5rB+Y7/JEXmQ/Ew== 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=1709393734; 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=OeuWbhiOpiX+rteucsoKiDHSE6YhwcZtItGVlntVTaY=; b=nwp7B61vTUSn128IY/Cn0eTa1ybUYIC8ADPJSy6JPe13Xls9lCnfGrKLzOijUXj5TRE02t RfdX7iI0yqP0PAkZmzR3hnxM7J5W/9W4N3PUAT6AORaWNhHIZ83yXu5Hc/2XZMiaUxO4gl OIWZQMpb9KwyIt8xjMvb9GXY8ffQq+QBmiEgxVA9ICoKB5wZLa5EIzY0ww/ctKSxGGYS4p UIVi15HGSvfD1XBqJdkNW6u+dVgc9e8YHycZAhSEckTp8vKbmhCpZYnzo+145h/cQ50Ct4 RNhtRKbw9UZmGAHvSeRbjLsRR/6VpTJIRKX1g5tuDC1v3/F04otLwhH9n30zhA== 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 4Tn8DQ3Npkz1FYx; Sat, 2 Mar 2024 15:35:34 +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 422FZYKT016320; Sat, 2 Mar 2024 15:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 422FZYMS016317; Sat, 2 Mar 2024 15:35:34 GMT (envelope-from git) Date: Sat, 2 Mar 2024 15:35:34 GMT Message-Id: <202403021535.422FZYMS016317@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: 196e4af8285b - main - cad/openctm: Fix man path 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: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 196e4af8285b7442e1797017c3590f5935b2fea8 Auto-Submitted: auto-generated The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=196e4af8285b7442e1797017c3590f5935b2fea8 commit 196e4af8285b7442e1797017c3590f5935b2fea8 Author: Diane Bruce AuthorDate: 2024-03-02 15:34:08 +0000 Commit: Diane Bruce CommitDate: 2024-03-02 15:34:08 +0000 cad/openctm: Fix man path Fixed man path and while in here fixed bogus patch resulting in REINPLACE not doing anything, ran Makefile through portfmt. --- cad/openctm/Makefile | 17 +++++++++-------- cad/openctm/files/patch-Makefile.linux | 6 +++--- cad/openctm/pkg-plist | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cad/openctm/Makefile b/cad/openctm/Makefile index 760637c86904..95925327a7c0 100644 --- a/cad/openctm/Makefile +++ b/cad/openctm/Makefile @@ -1,6 +1,6 @@ PORTNAME= openctm DISTVERSION= 1.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= https://sourceforge.net/projects/openctm/files/ DISTNAME= OpenCTM-${DISTVERSION}-src @@ -12,17 +12,18 @@ WWW= https://sourceforge.net/projects/openctm/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ - libpnglite.so:graphics/pnglite \ +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libharfbuzz.so:print/harfbuzz \ + libpnglite.so:graphics/pnglite \ + libtinyxml.so:textproc/tinyxml BUILD_DEPENDS= pnglite>0:graphics/pnglite \ tinyxml>0:textproc/tinyxml -USES= compiler:c++11-lang dos2unix gettext-runtime gl gmake \ - gnome jpeg pkgconfig tar:bz2 -USE_GL= gl glu glew glut -USE_GNOME= gtk20 pango atk cairo gdkpixbuf2 glib20 +USES= compiler:c++11-lang dos2unix gettext-runtime gl gmake gnome \ + jpeg pkgconfig tar:bz2 +USE_GL= gl glew glu glut +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango MAKEFILE= Makefile.linux USE_LDCONFIG= yes diff --git a/cad/openctm/files/patch-Makefile.linux b/cad/openctm/files/patch-Makefile.linux index 8215e56fd237..d6179c849f74 100644 --- a/cad/openctm/files/patch-Makefile.linux +++ b/cad/openctm/files/patch-Makefile.linux @@ -1,5 +1,5 @@ ---- Makefile.linux.orig 2020-03-15 00:26:34 UTC -+++ Makefile.linux +--- Makefile.linux.orig 2024-03-02 10:17:18.143681000 -0500 ++++ Makefile.linux 2024-03-02 10:23:51.199192000 -0500 @@ -29,37 +29,41 @@ .phony: default all openctm toolset documentation install clean @@ -37,7 +37,7 @@ +LIBDIR = $(PREFIX)/lib/ +INCDIR = $(PREFIX)/include/ +BINDIR = $(PREFIX)/bin/ -+MAN1DIR = $(PREFIX)/man/man1/ ++MAN1DIR = $(PREFIX)/share/man/man1/ CP = cp MKDIR = mkdir -p diff --git a/cad/openctm/pkg-plist b/cad/openctm/pkg-plist index 842749929f44..cf4c47efb8bd 100644 --- a/cad/openctm/pkg-plist +++ b/cad/openctm/pkg-plist @@ -3,5 +3,5 @@ bin/ctmviewer include/openctm.h include/openctmpp.h lib/libopenctm.so -man/man1/ctmconv.1.gz -man/man1/ctmviewer.1.gz +share/man/man1/ctmconv.1.gz +share/man/man1/ctmviewer.1.gz