Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Mar 2024 15:35:34 GMT
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 196e4af8285b - main - cad/openctm: Fix man path
Message-ID:  <202403021535.422FZYMS016317@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by db:

URL: https://cgit.FreeBSD.org/ports/commit/?id=196e4af8285b7442e1797017c3590f5935b2fea8

commit 196e4af8285b7442e1797017c3590f5935b2fea8
Author:     Diane Bruce <db@FreeBSD.org>
AuthorDate: 2024-03-02 15:34:08 +0000
Commit:     Diane Bruce <db@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403021535.422FZYMS016317>