[pkgsrc/pkgsrc-2009Q4]: pkgsrc/pkgtools/x11-links Pullup ticket 3015 - reques...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8e0c80b5270
branches:  pkgsrc-2009Q4
changeset: 569266:d8e0c80b5270
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Feb 21 21:22:52 2010 +0000

description:
Pullup ticket 3015 - requested by bouyer
bug fix

Revisions pulled up:
- pkgsrc/pkgtools/x11-links/Makefile    1.110

Files added:
pkgsrc/pkgtools/x11-links/files/xfree.libXpm

Files deleted:
pkgsrc/pkgtools/x11-links/files/xfree.xpm

   --------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   bouyer
   Date:           Sat Feb 20 16:23:29 UTC 2010

   Modified Files:
           pkgsrc/pkgtools/x11-links: Makefile
   Added Files:
           pkgsrc/pkgtools/x11-links/files: xfree.libXpm
   Removed Files:
           pkgsrc/pkgtools/x11-links/files: xfree.xpm

   Log Message:
   Rename xfree.xpm to xfree.libXpm, so that xfree.mk will find it.
   Fixes PR pkg/42827 and should also fix pkg/42671 once pulled up.
   PKGREVISION++


   To generate a diff of this commit:
   cvs rdiff -u -r1.109 -r1.110 pkgsrc/pkgtools/x11-links/Makefile
   cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xfree.libXpm
   cvs rdiff -u -r1.3 -r0 pkgsrc/pkgtools/x11-links/files/xfree.xpm

diffstat:

 pkgtools/x11-links/Makefile           |   3 ++-
 pkgtools/x11-links/files/xfree.libXpm |  11 +++++++++++
 pkgtools/x11-links/files/xfree.xpm    |  11 -----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diffs (46 lines):

diff -r 8510e5def4ff -r d8e0c80b5270 pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Fri Feb 19 15:31:49 2010 +0000
+++ b/pkgtools/x11-links/Makefile       Sun Feb 21 21:22:52 2010 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.107 2009/12/30 17:10:32 tron Exp $
+# $NetBSD: Makefile,v 1.107.2.1 2010/02/21 21:22:52 spz Exp $
 #
 # NOTE:        If you update this package, then you'll likely need to also update
 #      the x11-links dependency in buildlink3.mk to the correct version,
 #      usually the most recent.
 
 DISTNAME=      x11-links-0.45.${OS_VERSION}
+PKGREVISION=   1
 CATEGORIES=    pkgtools x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 8510e5def4ff -r d8e0c80b5270 pkgtools/x11-links/files/xfree.libXpm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/x11-links/files/xfree.libXpm     Sun Feb 21 21:22:52 2010 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: xfree.libXpm,v 1.1.2.2 2010/02/21 21:22:52 spz Exp $
+#
+include/X11/xpm.h
+lib/libXpm.a
+lib/libXpm.so
+lib/libXpm.so.4
+lib/libXpm.so.4.11
+lib/libXpm.dylib
+lib/libXpm.4.dylib
+lib/libXpm.4.11.dylib
+lib/pkgconfig/xpm.pc
diff -r 8510e5def4ff -r d8e0c80b5270 pkgtools/x11-links/files/xfree.xpm
--- a/pkgtools/x11-links/files/xfree.xpm        Fri Feb 19 15:31:49 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: xfree.xpm,v 1.3 2008/10/05 21:36:35 cube Exp $
-#
-include/X11/xpm.h
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXpm.so.4.11
-lib/libXpm.dylib
-lib/libXpm.4.dylib
-lib/libXpm.4.11.dylib
-lib/pkgconfig/xpm.pc