pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/43061: update x11/fltk to 1.1.10



>Number:         43061
>Category:       pkg
>Synopsis:       update x11/fltk to 1.1.10
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Mar 25 19:20:00 +0000 2010
>Originator:     Tim Larson
>Release:        5.0.2
>Organization:
>Environment:
n/a
>Description:
FLTK is now at version 1.1.10.  Porting existing patches to new version is very 
straightforward.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fltk/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile    18 Jan 2010 09:59:33 -0000      1.70
+++ Makefile    25 Mar 2010 19:15:23 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.70 2010/01/18 09:59:33 wiz Exp $

-DISTNAME=      fltk-1.1.9-source
-PKGREVISION=   3
+DISTNAME=      fltk-1.1.10-source
 PKGNAME=       ${DISTNAME:S/-source//}
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fltk/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- distinfo    16 Nov 2008 07:13:36 -0000      1.18
+++ distinfo    25 Mar 2010 19:15:23 -0000
@@ -1,12 +1,12 @@
 $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
-Size (fltk-1.1.9-source.tar.bz2) = 2206178 bytes
+SHA1 (fltk-1.1.10-source.tar.bz2) = 0d2b34fede91fa78eeaefb893dd70282f73908a8
+RMD160 (fltk-1.1.10-source.tar.bz2) = f8fc4371811efcc0d6fc73edd0525d8ff87a4faa
+Size (fltk-1.1.10-source.tar.bz2) = 2214382 bytes
 SHA1 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
 SHA1 (patch-ab) = 00032b947f47686eb8ddafde065be602fd355819
 SHA1 (patch-ac) = 0e992d6850048f4686b897b3987511c9bd8f9a9e
 SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
-SHA1 (patch-ae) = 80fe35839fab62672e66f5035aaf5fff7d4956e7
+SHA1 (patch-ae) = f9dd8d287df48322e04ce5dffe6d3bbaa93cba4f
 SHA1 (patch-af) = 18df280c50da04d671b1ebc77e22e670ccdaf709
-SHA1 (patch-ag) = 70f32e45b0a1e086427ffcfafe41495ffb38f6c0
+SHA1 (patch-ag) = 7ce3ea4c35bcdcd16322efd725cdfc0ccaa98536
cvs diff: Diffing patches
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fltk/patches/patch-ae,v
retrieving revision 1.7
diff -u -r1.7 patch-ae
--- patches/patch-ae    16 Nov 2008 07:13:37 -0000      1.7
+++ patches/patch-ae    25 Mar 2010 19:15:23 -0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2008/11/16 07:13:37 dsainty Exp $
-
---- fluid/Makefile.orig        2008-02-27 04:26:08.000000000 +1300
-+++ fluid/Makefile     2008-11-16 19:22:46.000000000 +1300
+--- fluid/Makefile.orig        2008-12-29 14:21:29.000000000 -0600
++++ fluid/Makefile     2010-03-25 13:59:18.000000000 -0500
 @@ -57,7 +57,7 @@
- fluid$(EXEEXT):               $(OBJECTS) ../lib/$(LIBNAME) 
../lib/$(FLLIBNAME) \
-                       ../lib/$(IMGLIBNAME)
+ fluid$(EXEEXT):               $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+                       $(IMGLIBNAME)
        echo Linking $@...
 -      $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) 
$(LINKFLTKIMG) $(LDLIBS)
 +      ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ 
$(OBJECTS:.o=.lo) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fltk/patches/patch-ag,v
retrieving revision 1.7
diff -u -r1.7 patch-ag
--- patches/patch-ag    10 Nov 2008 19:03:15 -0000      1.7
+++ patches/patch-ag    25 Mar 2010 19:15:23 -0000
@@ -1,8 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2008/11/10 19:03:15 adam Exp $
-
---- src/Makefile.orig  2008-02-27 16:00:31.000000000 +0100
-+++ src/Makefile
-@@ -208,6 +208,10 @@ $(LIBNAME): $(OBJECTS)
+--- src/Makefile.orig  2009-07-02 04:42:17.000000000 -0500
++++ src/Makefile       2010-03-25 14:03:14.000000000 -0500
+@@ -208,6 +208,10 @@
        $(LIBCOMMAND) $@ $(OBJECTS)
        $(RANLIB) $@

@@ -13,7 +11,7 @@
  libfltk.so.1.1: $(OBJECTS)
        echo $(DSOCOMMAND) $@ ...
        $(DSOCOMMAND) $@ $(OBJECTS)
-@@ -244,6 +248,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -244,6 +248,10 @@
        $(LIBCOMMAND) $@ $(FLOBJECTS)
        $(RANLIB) $@

@@ -24,7 +22,7 @@
  libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
        $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-@@ -280,6 +288,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -280,6 +288,10 @@
        $(LIBCOMMAND) $@ $(GLOBJECTS)
        $(RANLIB) $@

@@ -35,7 +33,7 @@
  libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
        $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-@@ -316,6 +328,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -316,6 +328,10 @@
        $(LIBCOMMAND) $@ $(IMGOBJECTS)
        $(RANLIB) $@

@@ -46,17 +44,17 @@
  libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
        echo $(DSOCOMMAND) $@ ...
        $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
-@@ -504,6 +520,9 @@ install: $(LIBNAME) $(DSONAME) \
-               $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
+@@ -504,6 +520,9 @@
+               $(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
        fi
-       $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
+       $(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
 +      if test x$(DSONAME) = xlibfltk.la; then\
 +              ${LIBTOOL} --mode=install $(INSTALL_LIB) libfltk.la 
$(DESTDIR)$(libdir); \
 +      fi
        if test x$(DSONAME) = xlibfltk.so.1.1; then\
                $(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
                $(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
-@@ -523,6 +542,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -523,6 +542,9 @@
                $(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
                $(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
        fi
@@ -66,7 +64,7 @@
        if test x$(DSONAME) = xcygfltknox-1.1.dll; then\
                $(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
                $(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-@@ -540,6 +562,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -540,6 +562,9 @@
                $(INSTALL_LIB) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
                $(LN) libfltk_forms.so.1.1 
$(DESTDIR)$(libdir)/libfltk_forms.so;\
        fi
@@ -76,7 +74,7 @@
        if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
                $(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
                $(INSTALL_LIB) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \
-@@ -597,6 +622,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -597,6 +622,9 @@
                $(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
                $(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
        fi



Home | Main Index | Thread Index | Old Index