summaryrefslogtreecommitdiff
path: root/x11/fltk
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2008-11-16 07:13:36 +0000
committerdsainty <dsainty@pkgsrc.org>2008-11-16 07:13:36 +0000
commitf4fefdf92dfdcf1d03df398ae70181eb460d17ed (patch)
tree4a365acd025e0bc915a2e00d12b5e35cdb5341f6 /x11/fltk
parentbd998acf1fcb6801c768af9ccf698257cfd74fad (diff)
downloadpkgsrc-f4fefdf92dfdcf1d03df398ae70181eb460d17ed.tar.gz
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 (limited to 'x11/fltk')
-rw-r--r--x11/fltk/Makefile3
-rw-r--r--x11/fltk/distinfo4
-rw-r--r--x11/fltk/patches/patch-ae17
3 files changed, 17 insertions, 7 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 1fffe5e593e..ed55ff08e79 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -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 --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index b1177b2833e..a64ba8e6237 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -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-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
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 --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae
index 869b7ca23f5..dade286086d 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -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 @@ $NetBSD: patch-ae,v 1.6 2008/11/10 19:03:15 adam Exp $
$(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