pkgsrc-WIP-changes archive

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

remove gnome2 conflicts from mate-applets



Module Name:	pkgsrc-wip
Committed By:	Richard PALO <richard%NetBSD.org@localhost>
Pushed By:	richard
Date:		Mon May 16 13:45:49 2016 +0200
Changeset:	a48e77b80bc6cf6cfe7b93af655e78344d5c7f12

Modified Files:
	mate-applets/Makefile
	mate-applets/PLIST

Log Message:
remove gnome2 conflicts from mate-applets

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a48e77b80bc6cf6cfe7b93af655e78344d5c7f12

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mate-applets/Makefile |  4 ++--
 mate-applets/PLIST    | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs:
diff --git a/mate-applets/Makefile b/mate-applets/Makefile
index 01c547f..35d4207 100644
--- a/mate-applets/Makefile
+++ b/mate-applets/Makefile
@@ -1,5 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/04/10 12:08:34 krytarowski Exp $
 
+PKGREVISION= 1
 .include "../../wip/mate/Makefile.common"
 
 DISTNAME=	mate-applets-${MATE_VERSION}
@@ -7,12 +8,11 @@ CATEGORIES=	x11
 
 COMMENT=	MATE panel applets
 
-CONFLICTS+=	gnome-applets-[0-9]*
-
 TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec/mate-applets
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/mate-applets
 
diff --git a/mate-applets/PLIST b/mate-applets/PLIST
index 09a1128..af6d712 100644
--- a/mate-applets/PLIST
+++ b/mate-applets/PLIST
@@ -33,19 +33,19 @@ ${PYSITELIB}/mate_invest/quotes.pyo
 ${PYSITELIB}/mate_invest/widgets.py
 ${PYSITELIB}/mate_invest/widgets.pyc
 ${PYSITELIB}/mate_invest/widgets.pyo
-libexec/accessx-status-applet
-${PLIST.batt}libexec/battstat-applet
-libexec/command-applet
-libexec/invest-applet
-libexec/mate-charpick-applet
-libexec/mate-drivemount-applet
-libexec/mate-geyes-applet
-libexec/mate-multiload-applet
-libexec/mate-netspeed-applet
-libexec/mateweather-applet
-libexec/stickynotes-applet
-libexec/timer-applet
-libexec/trashapplet
+libexec/mate-applets/accessx-status-applet
+${PLIST.batt}libexec/mate-applets/battstat-applet
+libexec/mate-applets/command-applet
+libexec/mate-applets/invest-applet
+libexec/mate-applets/mate-charpick-applet
+libexec/mate-applets/mate-drivemount-applet
+libexec/mate-applets/mate-geyes-applet
+libexec/mate-applets/mate-multiload-applet
+libexec/mate-applets/mate-netspeed-applet
+libexec/mate-applets/mateweather-applet
+libexec/mate-applets/stickynotes-applet
+libexec/mate-applets/timer-applet
+libexec/mate-applets/trashapplet
 man/man1/mate-charpick-applet.1
 man/man1/mate-cpufreq-selector.1
 man/man1/mate-drivemount-applet.1


Home | Main Index | Thread Index | Old Index