summaryrefslogtreecommitdiff
path: root/x11/wxGTK28
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-06-16 20:48:37 +0000
committerjoerg <joerg@pkgsrc.org>2013-06-16 20:48:37 +0000
commit0a209222e6e46505fe210930c7a85b92d5b34b45 (patch)
tree4760780e723cad2708493a82c04192d8e5a1c595 /x11/wxGTK28
parent45d85a23787d2b592fd9484c8a0a58395c71db85 (diff)
downloadpkgsrc-0a209222e6e46505fe210930c7a85b92d5b34b45.tar.gz
Install the wxrc program, not the helper script. Bump revision.
Diffstat (limited to 'x11/wxGTK28')
-rw-r--r--x11/wxGTK28/Makefile4
-rw-r--r--x11/wxGTK28/distinfo6
-rw-r--r--x11/wxGTK28/patches/patch-ab16
3 files changed, 17 insertions, 9 deletions
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile
index b4956b27e00..f6fab358e1a 100644
--- a/x11/wxGTK28/Makefile
+++ b/x11/wxGTK28/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2013/06/15 06:57:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2013/06/16 20:48:37 joerg Exp $
#
.include "../../x11/wxGTK28/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= GTK-based implementation of the wxWidgets GUI library
BUILD_TARGET= all
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 7cba8e3360b..f00a5e0bb8b 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/06/15 05:47:12 wiz Exp $
+$NetBSD: distinfo,v 1.16 2013/06/16 20:48:37 joerg Exp $
SHA1 (wxGTK-2.8.12-libtool.diff.bz2) = f2c9b8a06c08101325ffe09ad77f4800f7aa8730
RMD160 (wxGTK-2.8.12-libtool.diff.bz2) = 05b763aa44a8e8c8ad565af2a188d7c6437f2133
@@ -7,7 +7,5 @@ SHA1 (wxGTK-2.8.12.tar.bz2) = a8d31ef924ae49e97690646b13d5a2a7be7dda10
RMD160 (wxGTK-2.8.12.tar.bz2) = c401f141ed9fb085c7b79a2f0db788ce6ae9309f
Size (wxGTK-2.8.12.tar.bz2) = 9292767 bytes
SHA1 (patch-aa) = ad2fcc73ffe0db67cb9ef5fe87fb1248f7b7675c
-SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
+SHA1 (patch-ab) = 6f6278ec6b92a39abe29ec09053cd7007cd32fef
SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
-SHA1 (patch-ca) = 7da457e1dbafb42766aa87c1ca9baca675e211ed
-SHA1 (patch-cb) = 8e3ca3df50ef678656787201317a2d2b385c861e
diff --git a/x11/wxGTK28/patches/patch-ab b/x11/wxGTK28/patches/patch-ab
index 245f2525df5..d1772e1155e 100644
--- a/x11/wxGTK28/patches/patch-ab
+++ b/x11/wxGTK28/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/03/23 00:38:55 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2013/06/16 20:48:37 joerg Exp $
---- utils/wxrc/Makefile.in.orig 2009-03-22 23:39:17.000000000 +0000
+--- utils/wxrc/Makefile.in.orig 2013-06-16 10:59:44.000000000 +0000
+++ utils/wxrc/Makefile.in
-@@ -108,7 +108,7 @@ distclean: clean
+@@ -110,15 +110,15 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
@@ -11,3 +11,13 @@ $NetBSD: patch-ab,v 1.2 2009/03/23 00:38:55 joerg Exp $
@COND_USE_XRC_1@
@COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd)
+ @COND_USE_XRC_1@install_wxrc: $(__wxrc___depname)
+ @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ ${BSD_INSTALL_SCRIPT} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
++@COND_USE_XRC_1@ libtool --mode=install ${BSD_INSTALL_PROGRAM} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ ${BSD_INSTALL_SCRIPT} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
++@COND_USE_XRC_1@ libtool --mode=install ${BSD_INSTALL_PROGRAM} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+