diff options
| author | jlam <jlam@pkgsrc.org> | 2002-11-25 18:58:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-11-25 18:58:36 +0000 |
| commit | 971832637336f9e16b2530c8f196a3c88d2434c8 (patch) | |
| tree | 158d95ff651d9692d96fe3d4336253a6c1c204d1 /x11 | |
| parent | 9a50e4c655bf3134d8b9a7cbbc488f8bb9224655 (diff) | |
| download | pkgsrc-971832637336f9e16b2530c8f196a3c88d2434c8.tar.gz | |
Bump PKGREVISION to on x11/fltk to 1: link the dependent libraries
directly into libfltk.{la,so} so that we don't need to guess at which
additional libraries will be needed to link into a program when linking
against libfltk. Suggested in private email by Dave Sainty <dave at
dtsp dot co dot nz>.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk/Makefile | 11 | ||||
| -rw-r--r-- | x11/fltk/distinfo | 4 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ag | 12 |
3 files changed, 14 insertions, 13 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index f8e0d9be09c..5e97d360425 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.24 2002/08/25 18:40:29 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2002/11/25 18:58:36 jlam Exp $ # -DISTNAME= ${PKGNAME}-source -PKGNAME= fltk-1.0.11 -VERS= ${PKGNAME:S/fltk-//} -WRKSRC= ${WRKDIR}/${PKGNAME} +DISTNAME= fltk-1.0.11-source +PKGNAME= ${DISTNAME:S/-source//} +PKGREVISION= 1 +VERS= ${DISTNAME:S/fltk-//:S/-source//} +WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=FLTK/} \ ftp://ftp.fltk.org/pub/fltk/${VERS}/ \ diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo index 0dab6097632..9295f98aab0 100644 --- a/x11/fltk/distinfo +++ b/x11/fltk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/05/26 06:37:45 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/11/25 18:58:36 jlam Exp $ SHA1 (fltk-1.0.11-source.tar.bz2) = daf8593ca6d794ac779cf8e0ec43dd5d275a39ad Size (fltk-1.0.11-source.tar.bz2) = 999099 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 6b6c0f6af35cc0f77a23adaab5a636e660e2ddac SHA1 (patch-ad) = 3d20ba261a675f508a270ef7864626a74ba1a357 SHA1 (patch-ae) = 4c020ba0ffd321a1d9c0b083698c53dd3e354e0a SHA1 (patch-af) = f44d69eda82621e14c395ededfaa64ed3b1ac972 -SHA1 (patch-ag) = 20fed3a15f9b4b27fb719fe7a8ffe154e0244703 +SHA1 (patch-ag) = c03b860c9506c95f60947a0c08bec677f40d5cc6 SHA1 (patch-ah) = 0514008f3c66fe8e5533ff01d12d0063b885fc25 diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag index f40a969aa71..38919f44fed 100644 --- a/x11/fltk/patches/patch-ag +++ b/x11/fltk/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2001/05/26 06:37:46 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2002/11/25 18:58:37 jlam Exp $ ---- src/Makefile.orig Mon Jan 22 10:13:40 2001 +--- src/Makefile.orig Mon Jan 22 07:13:40 2001 +++ src/Makefile -@@ -148,17 +148,18 @@ +@@ -148,17 +148,18 @@ CLEAN = include ../makeinclude @@ -19,12 +19,12 @@ $NetBSD: patch-ag,v 1.1 2001/05/26 06:37:46 jlam Exp $ $(RANLIB) $@ +libfltk.la: $(OBJECTS) -+ $(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:5 ++ $(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:5 $(LDLIBS) + libfltk.so.1 libfltk.sl.1: $(OBJECTS) echo $(DSOCOMMAND) $@ ... $(DSOCOMMAND) $@ $(OBJECTS) -@@ -174,11 +175,13 @@ +@@ -174,11 +175,13 @@ include makedepend ################################################################ @@ -40,7 +40,7 @@ $NetBSD: patch-ag,v 1.1 2001/05/26 06:37:46 jlam Exp $ -chmod 644 $(libdir)/$(LIBNAME) if test "$(DSONAME)" = libfltk.so.1; then\ rm -f $(libdir)/libfltk.so*;\ -@@ -192,11 +195,13 @@ +@@ -192,11 +195,13 @@ install: $(LIBRARY) $(DSONAME) chmod 755 $(libdir)/libfltk.sl.1; \ ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\ fi |