pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
SLADE: Rename to slade
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Mon Jul 12 16:22:48 2021 +0200
Changeset: 677c104b0cfff7915ca7f6736cc9f5e0c6ae78fb
Added Files:
slade/COMMIT_MSG
slade/DESCR
slade/Makefile
slade/PLIST
slade/TODO
slade/distinfo
slade/patches/patch-src_External_zreaders_m__alloc.cpp
slade/patches/patch-src_External_zreaders_portable__endian.h
Removed Files:
SLADE/COMMIT_MSG
SLADE/DESCR
SLADE/Makefile
SLADE/PLIST
SLADE/TODO
SLADE/distinfo
SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
SLADE/patches/patch-src_External_zreaders_portable__endian.h
Log Message:
SLADE: Rename to slade
All lowercase names are preferred for pkgsrc.
The installed binary was already named "slade".
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=677c104b0cfff7915ca7f6736cc9f5e0c6ae78fb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
SLADE/COMMIT_MSG | 10 -----
SLADE/DESCR | 4 --
SLADE/Makefile | 50 ----------------------
SLADE/PLIST | 6 ---
SLADE/TODO | 4 --
SLADE/distinfo | 8 ----
.../patch-src_External_zreaders_m__alloc.cpp | 48 ---------------------
.../patch-src_External_zreaders_portable__endian.h | 20 ---------
slade/COMMIT_MSG | 10 +++++
slade/DESCR | 4 ++
slade/Makefile | 50 ++++++++++++++++++++++
slade/PLIST | 6 +++
slade/TODO | 4 ++
slade/distinfo | 8 ++++
.../patch-src_External_zreaders_m__alloc.cpp | 48 +++++++++++++++++++++
.../patch-src_External_zreaders_portable__endian.h | 20 +++++++++
16 files changed, 150 insertions(+), 150 deletions(-)
diffs:
diff --git a/SLADE/COMMIT_MSG b/SLADE/COMMIT_MSG
deleted file mode 100644
index aa37b1c2e1..0000000000
--- a/SLADE/COMMIT_MSG
+++ /dev/null
@@ -1,10 +0,0 @@
-games/SLADE: Import version 3.1.13
-
-SLADE3 is a modern editor for Doom-engine based games and source ports.
-It has the ability to view, modify, and write many different game-specific
-formats, and even convert between some of them, or from/to other generic
-formats such as PNG.
-
-SLADE3 can be considered a successor to both SLumpEd and SLADE - it combines
-the features of both, to create an all-in-one editor. Why does it keep the
-name of what was previously just a map editor? Because it fits :)
diff --git a/SLADE/DESCR b/SLADE/DESCR
deleted file mode 100644
index eb25755909..0000000000
--- a/SLADE/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SLADE3 is a modern editor for Doom-engine based games and source ports.
-It has the ability to view, modify, and write many different game-specific
-formats, and even convert between some of them, or from/to other generic
-formats such as PNG.
diff --git a/SLADE/Makefile b/SLADE/Makefile
deleted file mode 100644
index fc3705fd4f..0000000000
--- a/SLADE/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD$
-
-DISTNAME= SLADE-3.1.13
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GITHUB:=sirjuddington/}
-GITHUB_TAG= ${DISTNAME:S/SLADE-//}
-
-MAINTAINER= micha%NetBSD.org@localhost
-HOMEPAGE= https://slade.mancubus.net/
-COMMENT= It's a Doom Editor
-LICENSE= gnu-gpl-v2
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_LANGUAGES= c c++14
-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_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
-.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}
-CMAKE_ARGS+= -DWX_GTK3=OFF
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/SLADE/PLIST b/SLADE/PLIST
deleted file mode 100644
index 26e60ba151..0000000000
--- a/SLADE/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@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
deleted file mode 100644
index 58a0264733..0000000000
--- a/SLADE/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-[X] Fix pkglint errors
-[X] Unbreak installation
-[X] Create PLIST
-[ ] Propose merge of pkgsrc patches upstream
diff --git a/SLADE/distinfo b/SLADE/distinfo
deleted file mode 100644
index ebebb98145..0000000000
--- a/SLADE/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (SLADE-3.1.13.tar.gz) = 4a11c744284ef884650f356bc0a892deb49c84f3
-RMD160 (SLADE-3.1.13.tar.gz) = 921ed1ebd0465e9a7bd61c947c8bd748d6034b0b
-SHA512 (SLADE-3.1.13.tar.gz) = 4f1f8ca86df7eb2a2ec8d0e9ba8a8a80c69a87910f9c4ab9fb705fc128324a131a26c4b1ed122dbd0b685652328097dd9dffd49e4fc356bf44ba2254505c8ea9
-Size (SLADE-3.1.13.tar.gz) = 5890835 bytes
-SHA1 (patch-src_External_zreaders_m__alloc.cpp) = 7c42fa1ca0add5c2b6b147fdd7dfa3f21e7fb0a9
-SHA1 (patch-src_External_zreaders_portable__endian.h) = df66b810b2a6a9272d8c668d7d4debd78bba95b5
diff --git a/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp b/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
deleted file mode 100644
index 57d3b413ad..0000000000
--- a/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD$
-
-Explicitly check for FreeBSD, Linux, macOS and Windows.
-Use the generic algorithm for all other OS (formerly only for "__sun").
-
---- src/External/zreaders/m_alloc.cpp.orig 2020-05-27 23:08:34.000000000 +0000
-+++ src/External/zreaders/m_alloc.cpp
-@@ -57,14 +57,18 @@ namespace GC
- #endif
- #if defined(__APPLE__)
- #define _msize(p) malloc_size(p)
--#elif defined(__sun)
--#define _msize(p) (*((size_t*)(p)-1))
--#elif !defined(_WIN32)
-+#elif defined(__FreeBSD__) || defined(__linux__)
- #define _msize(p) malloc_usable_size(p) // from glibc/FreeBSD
-+#elif !defined(_WIN32)
-+// For all other OS not handled above
-+#define M_ALLOC_GENERIC 1
-+#define _msize(p) (*((size_t*)(p)-1))
- #endif
-
-+
-+
- #ifndef _DEBUG
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void *M_Malloc(size_t size)
- {
- void *block = malloc(size);
-@@ -134,7 +138,7 @@ void *M_Realloc(void *memblock, size_t s
- #include <crtdbg.h>
- #endif
-
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
- {
- void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
-@@ -202,7 +206,7 @@ void *M_Realloc_Dbg(void *memblock, size
- #endif
- #endif
-
--#if !defined(__sun)
-+#if !M_ALLOC_GENERIC
- void M_Free (void *block)
- {
- if (block != NULL)
diff --git a/SLADE/patches/patch-src_External_zreaders_portable__endian.h b/SLADE/patches/patch-src_External_zreaders_portable__endian.h
deleted file mode 100644
index d20c7a73ec..0000000000
--- a/SLADE/patches/patch-src_External_zreaders_portable__endian.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-NetBSD already has defined beXXtoh() and leXXtoh(x) in "sys/endian.h".
-
---- src/External/zreaders/portable_endian.h.orig 2020-05-27 23:08:34.000000000 +0000
-+++ src/External/zreaders/portable_endian.h
-@@ -48,11 +48,11 @@
- # define __LITTLE_ENDIAN LITTLE_ENDIAN
- # define __PDP_ENDIAN PDP_ENDIAN
-
--#elif defined(__OpenBSD__)
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-
- # include <sys/endian.h>
-
--#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-
- # include <sys/endian.h>
-
diff --git a/slade/COMMIT_MSG b/slade/COMMIT_MSG
new file mode 100644
index 0000000000..aa37b1c2e1
--- /dev/null
+++ b/slade/COMMIT_MSG
@@ -0,0 +1,10 @@
+games/SLADE: Import version 3.1.13
+
+SLADE3 is a modern editor for Doom-engine based games and source ports.
+It has the ability to view, modify, and write many different game-specific
+formats, and even convert between some of them, or from/to other generic
+formats such as PNG.
+
+SLADE3 can be considered a successor to both SLumpEd and SLADE - it combines
+the features of both, to create an all-in-one editor. Why does it keep the
+name of what was previously just a map editor? Because it fits :)
diff --git a/slade/DESCR b/slade/DESCR
new file mode 100644
index 0000000000..eb25755909
--- /dev/null
+++ b/slade/DESCR
@@ -0,0 +1,4 @@
+SLADE3 is a modern editor for Doom-engine based games and source ports.
+It has the ability to view, modify, and write many different game-specific
+formats, and even convert between some of them, or from/to other generic
+formats such as PNG.
diff --git a/slade/Makefile b/slade/Makefile
new file mode 100644
index 0000000000..fc3705fd4f
--- /dev/null
+++ b/slade/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD$
+
+DISTNAME= SLADE-3.1.13
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_GITHUB:=sirjuddington/}
+GITHUB_TAG= ${DISTNAME:S/SLADE-//}
+
+MAINTAINER= micha%NetBSD.org@localhost
+HOMEPAGE= https://slade.mancubus.net/
+COMMENT= It's a Doom Editor
+LICENSE= gnu-gpl-v2
+
+.include "../../mk/bsd.prefs.mk"
+
+USE_LANGUAGES= c c++14
+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_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
+.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}
+CMAKE_ARGS+= -DWX_GTK3=OFF
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/slade/PLIST b/slade/PLIST
new file mode 100644
index 0000000000..26e60ba151
--- /dev/null
+++ b/slade/PLIST
@@ -0,0 +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
new file mode 100644
index 0000000000..58a0264733
--- /dev/null
+++ b/slade/TODO
@@ -0,0 +1,4 @@
+[X] Fix pkglint errors
+[X] Unbreak installation
+[X] Create PLIST
+[ ] Propose merge of pkgsrc patches upstream
diff --git a/slade/distinfo b/slade/distinfo
new file mode 100644
index 0000000000..ebebb98145
--- /dev/null
+++ b/slade/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (SLADE-3.1.13.tar.gz) = 4a11c744284ef884650f356bc0a892deb49c84f3
+RMD160 (SLADE-3.1.13.tar.gz) = 921ed1ebd0465e9a7bd61c947c8bd748d6034b0b
+SHA512 (SLADE-3.1.13.tar.gz) = 4f1f8ca86df7eb2a2ec8d0e9ba8a8a80c69a87910f9c4ab9fb705fc128324a131a26c4b1ed122dbd0b685652328097dd9dffd49e4fc356bf44ba2254505c8ea9
+Size (SLADE-3.1.13.tar.gz) = 5890835 bytes
+SHA1 (patch-src_External_zreaders_m__alloc.cpp) = 7c42fa1ca0add5c2b6b147fdd7dfa3f21e7fb0a9
+SHA1 (patch-src_External_zreaders_portable__endian.h) = df66b810b2a6a9272d8c668d7d4debd78bba95b5
diff --git a/slade/patches/patch-src_External_zreaders_m__alloc.cpp b/slade/patches/patch-src_External_zreaders_m__alloc.cpp
new file mode 100644
index 0000000000..57d3b413ad
--- /dev/null
+++ b/slade/patches/patch-src_External_zreaders_m__alloc.cpp
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Explicitly check for FreeBSD, Linux, macOS and Windows.
+Use the generic algorithm for all other OS (formerly only for "__sun").
+
+--- src/External/zreaders/m_alloc.cpp.orig 2020-05-27 23:08:34.000000000 +0000
++++ src/External/zreaders/m_alloc.cpp
+@@ -57,14 +57,18 @@ namespace GC
+ #endif
+ #if defined(__APPLE__)
+ #define _msize(p) malloc_size(p)
+-#elif defined(__sun)
+-#define _msize(p) (*((size_t*)(p)-1))
+-#elif !defined(_WIN32)
++#elif defined(__FreeBSD__) || defined(__linux__)
+ #define _msize(p) malloc_usable_size(p) // from glibc/FreeBSD
++#elif !defined(_WIN32)
++// For all other OS not handled above
++#define M_ALLOC_GENERIC 1
++#define _msize(p) (*((size_t*)(p)-1))
+ #endif
+
++
++
+ #ifndef _DEBUG
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void *M_Malloc(size_t size)
+ {
+ void *block = malloc(size);
+@@ -134,7 +138,7 @@ void *M_Realloc(void *memblock, size_t s
+ #include <crtdbg.h>
+ #endif
+
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
+ {
+ void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
+@@ -202,7 +206,7 @@ void *M_Realloc_Dbg(void *memblock, size
+ #endif
+ #endif
+
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void M_Free (void *block)
+ {
+ if (block != NULL)
diff --git a/slade/patches/patch-src_External_zreaders_portable__endian.h b/slade/patches/patch-src_External_zreaders_portable__endian.h
new file mode 100644
index 0000000000..d20c7a73ec
--- /dev/null
+++ b/slade/patches/patch-src_External_zreaders_portable__endian.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+NetBSD already has defined beXXtoh() and leXXtoh(x) in "sys/endian.h".
+
+--- src/External/zreaders/portable_endian.h.orig 2020-05-27 23:08:34.000000000 +0000
++++ src/External/zreaders/portable_endian.h
+@@ -48,11 +48,11 @@
+ # define __LITTLE_ENDIAN LITTLE_ENDIAN
+ # define __PDP_ENDIAN PDP_ENDIAN
+
+-#elif defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+
+ # include <sys/endian.h>
+
+-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+
+ # include <sys/endian.h>
+
Home |
Main Index |
Thread Index |
Old Index