Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Nov 2014 23:46:38 +0000 (UTC)
From:      Bartek Rutkowski <robak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373471 - in head/editors/sublime3: . files
Message-ID:  <201411262346.sAQNkcjt044067@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: robak
Date: Wed Nov 26 23:46:37 2014
New Revision: 373471
URL: https://svnweb.freebsd.org/changeset/ports/373471
QAT: https://qat.redports.org/buildarchive/r373471/

Log:
  editors/sublime3: various fixes
  
  - Fix desktop file and icons
  - Add gtk2 dependency
  - Fix pkg-plist (remove unneeded files and and /Icons needed for the Title/taskbar)
  - Remove "STRIP" in the Makefile
  - Remove "@" where except for MKDIR in the Makefile
  
  PR:		194669
  Submitted by:	Miguel Clara <miguelmclara@gmail.com>

Modified:
  head/editors/sublime3/Makefile
  head/editors/sublime3/files/sublime.in
  head/editors/sublime3/pkg-plist

Modified: head/editors/sublime3/Makefile
==============================================================================
--- head/editors/sublime3/Makefile	Wed Nov 26 23:20:49 2014	(r373470)
+++ head/editors/sublime3/Makefile	Wed Nov 26 23:46:37 2014	(r373471)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sublime
 PORTVERSION=	3.0.65
+PORTREVISION=	1
 CATEGORIES=	editors linux
 MASTER_SITES=	http://c758482.r82.cf2.rackcdn.com/
 PKGNAMEPREFIX=	linux-
@@ -11,41 +12,39 @@ DISTNAME=	sublime_text_3_build_3065_x32
 MAINTAINER=	miguelmclara@gmail.com
 COMMENT=	Sublime Text is a sophisticated text editor for code, markup and prose
 
-USES=	tar:bzip2
-INSTALLS_ICONS=	yes
-WRKSRC=	${WRKDIR}/sublime_text_3
+USES=		tar:bzip2 desktop-file-utils
+INSTALLS_ICONS= yes
+WRKSRC=		${WRKDIR}/sublime_text_3
 
 CONFLICTS=	linux-sublime-[0-24-9]*
 
 NO_BUILD=
-STRIP=	# don't strip linux binaries.
 SUB_FILES=	sublime
 
 USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX_APPS=	xorglibs gtk2
 
 post-patch:
 	${BRANDELF} -t Linux ${WRKSRC}/sublime_text
 	${BRANDELF} -t Linux ${WRKSRC}/plugin_host
-	${RM} -rf ${WRKSRC}/lib
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
-
-	@${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
-	@${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
-	@${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
-	@${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
-	@${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
-	@${RM} -rf ${WRKSRC}/Icon/
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
-	@${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
+	@${MKDIR} ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/ \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/ \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/ \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/ \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
+
+	${INSTALL_DATA} ${WRKSRC}/Icon/16x16/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/
+	${INSTALL_DATA} ${WRKSRC}/Icon/32x32/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/
+	${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
+	${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
+	${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime-text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
+	${INSTALL_DATA} ${WRKSRC}/sublime_text.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
+	${CHMOD} +x ${STAGEDIR}${DATADIR}/plugin_host
+	${INSTALL} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
 
 .include <bsd.port.mk>

Modified: head/editors/sublime3/files/sublime.in
==============================================================================
--- head/editors/sublime3/files/sublime.in	Wed Nov 26 23:20:49 2014	(r373470)
+++ head/editors/sublime3/files/sublime.in	Wed Nov 26 23:46:37 2014	(r373471)
@@ -1,2 +1,2 @@
 #!/compat/linux/bin/sh
-%%DATADIR%%/sublime_text
+%%DATADIR%%/sublime_text $*

Modified: head/editors/sublime3/pkg-plist
==============================================================================
--- head/editors/sublime3/pkg-plist	Wed Nov 26 23:20:49 2014	(r373470)
+++ head/editors/sublime3/pkg-plist	Wed Nov 26 23:46:37 2014	(r373471)
@@ -1,9 +1,15 @@
 bin/sublime
+share/applications/sublime_text.desktop
 share/icons/hicolor/128x128/apps/sublime-text.png
 share/icons/hicolor/16x16/apps/sublime-text.png
 share/icons/hicolor/256x256/apps/sublime-text.png
 share/icons/hicolor/32x32/apps/sublime-text.png
 share/icons/hicolor/48x48/apps/sublime-text.png
+%%DATADIR%%/Icon/128x128/sublime-text.png
+%%DATADIR%%/Icon/16x16/sublime-text.png
+%%DATADIR%%/Icon/256x256/sublime-text.png
+%%DATADIR%%/Icon/32x32/sublime-text.png
+%%DATADIR%%/Icon/48x48/sublime-text.png
 %%DATADIR%%/Packages/ASP.sublime-package
 %%DATADIR%%/Packages/ActionScript.sublime-package
 %%DATADIR%%/Packages/AppleScript.sublime-package



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