pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cad/oce oce: fix reference to non-existent file
details: https://anonhg.NetBSD.org/pkgsrc/rev/aa746d850fb0
branches: trunk
changeset: 386263:aa746d850fb0
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Oct 04 10:21:19 2022 +0000
description:
oce: fix reference to non-existent file
fix pkglint while here
diffstat:
cad/oce/Makefile | 12 ++++++------
cad/oce/PLIST.x11 | 6 +++---
cad/oce/buildlink3.mk | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diffs (88 lines):
diff -r 593231f91748 -r aa746d850fb0 cad/oce/Makefile
--- a/cad/oce/Makefile Tue Oct 04 10:06:11 2022 +0000
+++ b/cad/oce/Makefile Tue Oct 04 10:21:19 2022 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2022/03/19 23:55:42 brook Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/04 10:21:19 wiz Exp $
DISTNAME= OCE-0.18.3
PKGNAME= ${DISTNAME:tl}
PKGREVISION= 2
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=tpaviot/}
+GITHUB_TAG= ${DISTNAME}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/tpaviot/oce/
COMMENT= Open CASCADE Community Edition
LICENSE= gnu-lgpl-v2.1
-GITHUB_TAG= ${DISTNAME}
WRKSRC= ${WRKDIR}/oce-${DISTNAME}
USE_CMAKE= yes
@@ -31,15 +31,15 @@
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= Fixing PREFIX path.
SUBST_STAGE.prefix= post-configure
-SUBST_FILES.prefix= CMakeFiles/Export/lib/oce/OCE-libraries-release.cmake
-.if !empty(OPSYS:MDarwin)
+SUBST_FILES.prefix= CMakeFiles/Export/*/OCE-libraries-release.cmake
+.if ${OPSYS} == Darwin
SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.dylib|\1|g"
.else
SUBST_SED.prefix= -e "s|${BUILDLINK_DIR}/lib/lib\([0-9a-zA-Z_-]*\)\.so|\1|g"
.endif
-PLIST_VARS+= Darwin not_Darwin
-.if !empty(OPSYS:MDarwin)
+PLIST_VARS+= Darwin not_Darwin
+.if ${OPSYS} == Darwin
PLIST.Darwin= yes
.else
PLIST.not_Darwin= yes
diff -r 593231f91748 -r aa746d850fb0 cad/oce/PLIST.x11
--- a/cad/oce/PLIST.x11 Tue Oct 04 10:06:11 2022 +0000
+++ b/cad/oce/PLIST.x11 Tue Oct 04 10:21:19 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.x11,v 1.3 2022/03/19 23:55:42 brook Exp $
+@comment $NetBSD: PLIST.x11,v 1.4 2022/10/04 10:21:19 wiz Exp $
include/oce/AIS_AngleDimension.hxx
include/oce/AIS_AttributeFilter.lxx
include/oce/AIS_Axis.lxx
@@ -61,6 +61,8 @@
include/oce/BinTObjDrivers_ObjectDriver.hxx
include/oce/BinTObjDrivers_ReferenceDriver.hxx
include/oce/BinTObjDrivers_XYZDriver.hxx
+${PLIST.Darwin}include/oce/Cocoa_LocalPool.hxx
+${PLIST.Darwin}include/oce/Cocoa_Window.hxx
include/oce/DsgPrs_DatumPrs.hxx
include/oce/Font_BRepFont.hxx
include/oce/Font_FTFont.hxx
@@ -407,8 +409,6 @@
include/oce/XmlTObjDrivers_ReferenceDriver.hxx
include/oce/XmlTObjDrivers_XYZDriver.hxx
${PLIST.not_Darwin}include/oce/Xw_Window.hxx
-${PLIST.Darwin}include/oce/Cocoa_LocalPool.hxx
-${PLIST.Darwin}include/oce/Cocoa_Window.hxx
lib/libTKBin.so
lib/libTKBin.so.11
lib/libTKBin.so.11.0.0
diff -r 593231f91748 -r aa746d850fb0 cad/oce/buildlink3.mk
--- a/cad/oce/buildlink3.mk Tue Oct 04 10:06:11 2022 +0000
+++ b/cad/oce/buildlink3.mk Tue Oct 04 10:21:19 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/08/17 20:17:17 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/10/04 10:21:19 wiz Exp $
BUILDLINK_TREE+= oce
@@ -14,7 +14,7 @@
pkgbase := oce
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.oce:Mx11)
+.if ${PKG_BUILD_OPTIONS.oce:Mx11}
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index