pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

SLADE: Fix installation



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Aug 28 16:26:57 2020 +0200
Changeset:	c2f8d0be7b7a83fe41b4655dea8d61b6250bf251

Modified Files:
	SLADE/Makefile
	SLADE/PLIST
	SLADE/TODO
Removed Files:
	SLADE/files/INSTALL.pkgsrc

Log Message:
SLADE: Fix installation

Package works now.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c2f8d0be7b7a83fe41b4655dea8d61b6250bf251

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 SLADE/Makefile             | 21 ++++++++++++++++++---
 SLADE/PLIST                |  4 ++++
 SLADE/TODO                 |  4 ++--
 SLADE/files/INSTALL.pkgsrc |  6 ------
 4 files changed, 24 insertions(+), 11 deletions(-)

diffs:
diff --git a/SLADE/Makefile b/SLADE/Makefile
index 77786d7712..bc382fb569 100644
--- a/SLADE/Makefile
+++ b/SLADE/Makefile
@@ -13,19 +13,34 @@ LICENSE=	gnu-gpl-v2
 .include "../../mk/bsd.prefs.mk"
 
 USE_LANGUAGES=	c c++14
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config zip
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-Wno-dev
-CMAKE_ARGS+=	-DNO_COTIRE=ON  # cmake has similar functionality since 3.16
+CMAKE_ARGS+=	-DNO_COTIRE=ON  # CMake has similar functionality since 3.16
 CMAKE_ARGS+=	-DNO_WEBVIEW=ON
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release  # Use "Debug" for development
 
+INSTALLATION_DIRS+=	share/icons/hicolor/128x128/apps
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/applications/net.mancubus.SLADE.desktop \
+		${DESTDIR}${PREFIX}/share/applications/SLADE.desktop
+	${MV} ${DESTDIR}${PREFIX}/share/icons/net.mancubus.SLADE.png \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/SLADE.png
+	${MV} ${DESTDIR}${PREFIX}/share/metainfo/net.mancubus.SLADE.metainfo.xml \
+		${DESTDIR}${PREFIX}/share/metainfo/SLADE.metainfo.xml
+
+BUILDLINK_API_DEPENDS.fluidsynth+=	fluidsynth>=1.1.3
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
+BUILDLINK_API_DEPENDS.zlib+=		zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freeimage/buildlink3.mk"
 .include "../../graphics/ftgl/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.sfml+=		sfml>=2.0
 .include "../../multimedia/sfml/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .if ${PKG_BUILD_OPTIONS.wxGTK30:Mgtk2}
diff --git a/SLADE/PLIST b/SLADE/PLIST
index 1a8522c9b3..26e60ba151 100644
--- a/SLADE/PLIST
+++ b/SLADE/PLIST
@@ -1,2 +1,6 @@
 @comment $NetBSD$
 bin/slade
+share/applications/SLADE.desktop
+share/icons/hicolor/128x128/apps/SLADE.png
+share/metainfo/SLADE.metainfo.xml
+share/slade3/slade.pk3
diff --git a/SLADE/TODO b/SLADE/TODO
index ce345a67d5..582df19294 100644
--- a/SLADE/TODO
+++ b/SLADE/TODO
@@ -1,3 +1,3 @@
 [X] Fix pkglint errors
-[ ] Unbreak installation
-[ ] Create PLIST
+[X] Unbreak installation
+[X] Create PLIST
diff --git a/SLADE/files/INSTALL.pkgsrc b/SLADE/files/INSTALL.pkgsrc
deleted file mode 100644
index d077a196a0..0000000000
--- a/SLADE/files/INSTALL.pkgsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-The location of the crispy-doom WAD directory has been set to:
-
-   DOOMWADDIR
-
-This is the pkgsrc standard Doom WAD directory location (shared with other
-Doom packages).


Home | Main Index | Thread Index | Old Index