diff options
| author | spz <spz@pkgsrc.org> | 2010-02-21 21:22:52 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2010-02-21 21:22:52 +0000 |
| commit | 1df197ad3f0f922f330770fc0108d9da5c030380 (patch) | |
| tree | 993ab685cb65fd74501052542f4b6947e6f8188c | |
| parent | 26fc16f400211ad2c8e8a033d90f30bc57a8a856 (diff) | |
| download | pkgsrc-1df197ad3f0f922f330770fc0108d9da5c030380.tar.gz | |
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
| -rw-r--r-- | pkgtools/x11-links/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/x11-links/files/xfree.libXpm (renamed from pkgtools/x11-links/files/xfree.xpm) | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index bda50651914..a2db8ad061a 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 --git a/pkgtools/x11-links/files/xfree.xpm b/pkgtools/x11-links/files/xfree.libXpm index 1fe9d9a165e..92ee7af837e 100644 --- a/pkgtools/x11-links/files/xfree.xpm +++ b/pkgtools/x11-links/files/xfree.libXpm @@ -1,4 +1,4 @@ -# $NetBSD: xfree.xpm,v 1.3 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: xfree.libXpm,v 1.1.2.2 2010/02/21 21:22:52 spz Exp $ # include/X11/xpm.h lib/libXpm.a |