pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
tk-tkimg: some touch ups.
Module Name: pkgsrc-wip
Committed By: Maya Rashish <maya%NetBSD.org@localhost>
Pushed By: coypu
Date: Sun Nov 10 22:04:59 2019 +0200
Changeset: 8d7d8fdb4497660ac96a985c0403f42cef71436d
Modified Files:
tk-tkimg/Makefile
tk-tkimg/PLIST
tk-tkimg/distinfo
Added Files:
tk-tkimg/patches/patch-tkimg.h
Log Message:
tk-tkimg: some touch ups.
make the tests happier by reverting the version update.
(Not sure if right... many tests pass now)
use a pkgsrc-friendly version name, split from DISTNAME.
use a more generic 64bit check.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8d7d8fdb4497660ac96a985c0403f42cef71436d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
tk-tkimg/Makefile | 9 +++++++--
tk-tkimg/PLIST | 4 ++--
tk-tkimg/distinfo | 2 ++
tk-tkimg/patches/patch-tkimg.h | 15 +++++++++++++++
4 files changed, 26 insertions(+), 4 deletions(-)
diffs:
diff --git a/tk-tkimg/Makefile b/tk-tkimg/Makefile
index 9a2388145f..905201a720 100644
--- a/tk-tkimg/Makefile
+++ b/tk-tkimg/Makefile
@@ -2,6 +2,7 @@
#
DISTNAME= tkimg-1.3-2008-01-16
+PKGNAME= tkimg-1.3.20080116
CATEGORIES= graphics
MASTER_SITES= http://www.flightlab.com/~joe/downloads/
@@ -13,14 +14,18 @@ LICENSE= 2-clause-bsd # XXX ? Same as Tcl
WRKSRC= ${WRKDIR}/tkimg-1.3
GNU_CONFIGURE= yes
TEST_TARGET= test
-INSTALLATION_DIRS+= lib/Img${PKGVERSION}.9
+INSTALLATION_DIRS+= lib/Img1.3.9
.include "options.mk"
.if ${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS+= --enable-64bit-vis
-.elif ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "ia64"
+.else
+. for plat in ${LP64PLATFORMS}
+. if ${MACHINE_PLATFORM:M${plat}}
CONFIGURE_ARGS+= --enable-64bit
+. endif
+. endfor
.endif
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/tk-tkimg/PLIST b/tk-tkimg/PLIST
index afe9c92e8c..68f641cbc8 100644
--- a/tk-tkimg/PLIST
+++ b/tk-tkimg/PLIST
@@ -1,3 +1,3 @@
@comment $NetBSD: PLIST,v 1.2 2012/08/17 18:21:28 mwilhelmy Exp $
-lib/Img${PKGVERSION}.9/Img.so
-lib/Img${PKGVERSION}.9/pkgIndex.tcl
+lib/Img1.3.9/Img.so
+lib/Img1.3.9/pkgIndex.tcl
diff --git a/tk-tkimg/distinfo b/tk-tkimg/distinfo
index 49b42b3cf8..3f2432594b 100644
--- a/tk-tkimg/distinfo
+++ b/tk-tkimg/distinfo
@@ -2,5 +2,7 @@ $NetBSD: distinfo,v 1.3 2012/11/23 21:26:40 othyro Exp $
SHA1 (tkimg-1.3-2008-01-16.tar.gz) = 524d497c6b078906f131378d964cfa2fadbe2d46
RMD160 (tkimg-1.3-2008-01-16.tar.gz) = 0cdfdd306a6b396591dd98567723c6a7e9a52350
+SHA512 (tkimg-1.3-2008-01-16.tar.gz) = 7746e94a8de7c4c2bc41cbe7d805669b4161fdecb656b825c44104bc78af6e4c3c9119bdfdde04feb76f4c8bde45e68f5176d5b114a4ef6c860d570046bc8ffb
Size (tkimg-1.3-2008-01-16.tar.gz) = 363107 bytes
SHA1 (patch-Makefile.in) = c757bb9a8517fe21d48d672bae9e7def08954bc0
+SHA1 (patch-tkimg.h) = e97be13c3d424fa56bfc1d1181efa1ca9cbca7d0
diff --git a/tk-tkimg/patches/patch-tkimg.h b/tk-tkimg/patches/patch-tkimg.h
new file mode 100644
index 0000000000..465e3df9b0
--- /dev/null
+++ b/tk-tkimg/patches/patch-tkimg.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Revert version update to make the tests work.
+
+--- tkimg.h.orig 2005-01-24 19:08:06.000000000 +0000
++++ tkimg.h
+@@ -8,7 +8,7 @@
+
+ #include "tk.h"
+
+-#define TKIMG_VERSION "1.3.99"
++#define TKIMG_VERSION "1.3.9"
+
+ #if BUILD_tkimg
+ # define TKIMGAPI DLLEXPORT
Home |
Main Index |
Thread Index |
Old Index