pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Add conflicts with each other to the "gtk-engines"...
details: https://anonhg.NetBSD.org/pkgsrc/rev/77a431b93bc2
branches: trunk
changeset: 472143:77a431b93bc2
user: tron <tron%pkgsrc.org@localhost>
date: Mon Apr 05 13:27:00 2004 +0000
description:
Add conflicts with each other to the "gtk-engines" and the "gtk2-engines"
package because they installed identical files into the same directory.
diffstat:
x11/gtk-engines/Makefile | 4 +++-
x11/gtk2-engines/Makefile | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diffs (37 lines):
diff -r 63c67adb0712 -r 77a431b93bc2 x11/gtk-engines/Makefile
--- a/x11/gtk-engines/Makefile Mon Apr 05 12:43:20 2004 +0000
+++ b/x11/gtk-engines/Makefile Mon Apr 05 13:27:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/05 13:27:00 tron Exp $
DISTNAME= gtk-engines-0.12
PKGREVISION= 6
@@ -11,6 +11,8 @@
DEPENDS+= xdg-x11-dirs>=1.1:../../misc/xdg-x11-dirs
+CONFLICTS+= gtk2-engines-*
+
GNU_CONFIGURE= # defined
USE_BUILDLINK2= # defined
USE_X11BASE= # defined
diff -r 63c67adb0712 -r 77a431b93bc2 x11/gtk2-engines/Makefile
--- a/x11/gtk2-engines/Makefile Mon Apr 05 12:43:20 2004 +0000
+++ b/x11/gtk2-engines/Makefile Mon Apr 05 13:27:00 2004 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/04/04 22:44:06 recht Exp $
-#
+# $NetBSD: Makefile,v 1.22 2004/04/05 13:27:00 tron Exp $
DISTNAME= gtk-engines-2.2.0
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -14,6 +13,8 @@
DEPENDS+= xdg-dirs>=1.1:../../misc/xdg-dirs
+CONFLICTS+= gtk-engines-*
+
GNU_CONFIGURE= yes
USE_BUILDLINK3= yes
USE_X11= yes
Home |
Main Index |
Thread Index |
Old Index