[pkgsrc/trunk]: pkgsrc/x11/fltk Complete the libtoolisation of 'fluid' so it ...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ca34934979c
branches:  trunk
changeset: 550150:7ca34934979c
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Sun Nov 16 07:13:36 2008 +0000

description:
Complete the libtoolisation of 'fluid' so it installs the real executable,
not the libtool wrapper.

Bump PKGREVISION, the previous revision installed an unusable "fluid".

diffstat:

 x11/fltk/Makefile         |   3 ++-
 x11/fltk/distinfo         |   4 ++--
 x11/fltk/patches/patch-ae |  17 +++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 2707de65604a -r 7ca34934979c x11/fltk/Makefile
--- a/x11/fltk/Makefile Sun Nov 16 07:12:03 2008 +0000
+++ b/x11/fltk/Makefile Sun Nov 16 07:13:36 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2008/11/10 19:03:15 adam Exp $
+# $NetBSD: Makefile,v 1.67 2008/11/16 07:13:36 dsainty Exp $
 
 DISTNAME=      fltk-1.1.9-source
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-source//}
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11
diff -r 2707de65604a -r 7ca34934979c x11/fltk/distinfo
--- a/x11/fltk/distinfo Sun Nov 16 07:12:03 2008 +0000
+++ b/x11/fltk/distinfo Sun Nov 16 07:13:36 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2008/11/10 19:03:15 adam Exp $
+$NetBSD: distinfo,v 1.18 2008/11/16 07:13:36 dsainty Exp $
 
 SHA1 (fltk-1.1.9-source.tar.bz2) = 6f21903dc53c829ec71e8e49655eb19e624c8247
 RMD160 (fltk-1.1.9-source.tar.bz2) = f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91
@@ -7,6 +7,6 @@
 SHA1 (patch-ab) = 00032b947f47686eb8ddafde065be602fd355819
 SHA1 (patch-ac) = 0e992d6850048f4686b897b3987511c9bd8f9a9e
 SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
-SHA1 (patch-ae) = c4bfe5e5c6096babe697abe39e8ea328edb11adc
+SHA1 (patch-ae) = 80fe35839fab62672e66f5035aaf5fff7d4956e7
 SHA1 (patch-af) = 18df280c50da04d671b1ebc77e22e670ccdaf709
 SHA1 (patch-ag) = 70f32e45b0a1e086427ffcfafe41495ffb38f6c0
diff -r 2707de65604a -r 7ca34934979c x11/fltk/patches/patch-ae
--- a/x11/fltk/patches/patch-ae Sun Nov 16 07:12:03 2008 +0000
+++ b/x11/fltk/patches/patch-ae Sun Nov 16 07:13:36 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2008/11/10 19:03:15 adam Exp $
+$NetBSD: patch-ae,v 1.7 2008/11/16 07:13:37 dsainty Exp $
 
---- fluid/Makefile.orig        2008-11-10 17:29:24.000000000 +0100
-+++ fluid/Makefile
-@@ -57,7 +57,7 @@ all: $(FLUID) fluid$(EXEEXT)
+--- fluid/Makefile.orig        2008-02-27 04:26:08.000000000 +1300
++++ fluid/Makefile     2008-11-16 19:22:46.000000000 +1300
+@@ -57,7 +57,7 @@
  fluid$(EXEEXT):               $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
                        ../lib/$(IMGLIBNAME)
        echo Linking $@...
@@ -11,3 +11,12 @@
        $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
        $(POSTBUILD) $@ ../FL/mac.r
  
+@@ -81,7 +81,7 @@
+ install: all
+       echo "Installing FLUID in $(DESTDIR)$(bindir)..."
+       -$(INSTALL_DIR) $(DESTDIR)$(bindir)
+-      $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
++      ${LIBTOOL} --mode=install $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ install-linux:
+       -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications