Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Mar 2017 08:05:55 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435520 - in head/misc/mc: . files
Message-ID:  <201703060805.v2685tVZ037747@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: woodsb02
Date: Mon Mar  6 08:05:54 2017
New Revision: 435520
URL: https://svnweb.freebsd.org/changeset/ports/435520

Log:
  misc/mc: Only install desktop entry and icon if X11 option is enabled
  
  PR:		214812
  Submitted by:	Robert Schulze <rs@bytecamp.net>

Added:
  head/misc/mc/files/mc.png   (contents, props changed)
Modified:
  head/misc/mc/Makefile
  head/misc/mc/distinfo
  head/misc/mc/pkg-plist

Modified: head/misc/mc/Makefile
==============================================================================
--- head/misc/mc/Makefile	Mon Mar  6 07:31:21 2017	(r435519)
+++ head/misc/mc/Makefile	Mon Mar  6 08:05:54 2017	(r435520)
@@ -3,13 +3,10 @@
 
 PORTNAME=	mc
 PORTVERSION=	4.8.19
+PORTREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
-		http://ftp.osuosl.org/pub/midnightcommander/ \
-		SF/nemysisfreebsdp/misc/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
+		http://ftp.osuosl.org/pub/midnightcommander/
 
 MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	Midnight Commander, a free Norton Commander Clone
@@ -84,13 +81,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|SUBDIRS = intl|SUBDIRS =|' ${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+post-install-X11-on:
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>

Modified: head/misc/mc/distinfo
==============================================================================
--- head/misc/mc/distinfo	Mon Mar  6 07:31:21 2017	(r435519)
+++ head/misc/mc/distinfo	Mon Mar  6 08:05:54 2017	(r435520)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1488784684
+TIMESTAMP = 1488787262
 SHA256 (mc-4.8.19.tar.xz) = eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df
 SIZE (mc-4.8.19.tar.xz) = 2521808
-SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
-SIZE (mc.png) = 6466

Added: head/misc/mc/files/mc.png
==============================================================================
Binary file. No diff available.

Modified: head/misc/mc/pkg-plist
==============================================================================
--- head/misc/mc/pkg-plist	Mon Mar  6 07:31:21 2017	(r435519)
+++ head/misc/mc/pkg-plist	Mon Mar  6 08:05:54 2017	(r435520)
@@ -85,7 +85,7 @@ man/man1/mcview.1.gz
 %%NLS%%man/pl/man1/mc.1.gz
 %%NLS%%man/ru/man1/mc.1.gz
 %%NLS%%man/sr/man1/mc.1.gz
-share/applications/mc.desktop
+%%X11%%share/applications/mc.desktop
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
@@ -314,4 +314,4 @@ share/applications/mc.desktop
 %%EDITOR%%%%DATADIR%%/syntax/yaml.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yum-repo.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax
-share/pixmaps/mc.png
+%%X11%%share/pixmaps/mc.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703060805.v2685tVZ037747>