svn commit: r372259 - in head/editors/emacs-devel: . files

[Ashish SHUKLA]

Author: ashish
Date: Fri Nov  7 12:52:21 2014
New Revision: 372259
URL: https://svnweb.freebsd.org/changeset/ports/372259
QAT: https://qat.redports.org/buildarchive/r372259/

Log:
  - Fix pkg-install script to correctly install emacs games scores files[1]
  - Fix building port when ALSA option is enabled[2]
  - Depend on desktop-file-utils when X11 option is enabled[3]
  - Bump PORTREVISION to account for these changes
  
  PR:		194624[1], 194862[2]
  Submitted by:	crest <crest at sahiro.org>[2]
  Reported by:	Joseph Mingrone <jrm at ftfl.ca>[1],
  		Richard Kuhns <rjk at wintek.com>[3] (via private email)

Added:
  head/editors/emacs-devel/files/pkg-install.in
     - copied, changed from r372258, head/editors/emacs-devel/pkg-install
Deleted:
  head/editors/emacs-devel/pkg-install
Modified:
  head/editors/emacs-devel/Makefile

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Fri Nov  7 12:46:59 2014	(r372258)
+++ head/editors/emacs-devel/Makefile	Fri Nov  7 12:52:21 2014	(r372259)
@@ -3,6 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -31,6 +32,8 @@ INFO_PATH=	${DATADIR_REL}/info
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_AUTOTOOLS=	autoconf:env aclocal:env automake:env autoheader:env
 
+SUB_FILES=	pkg-install
+SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
 SHEBANG_FILES=	${WRKSRC}/lib-src/grep-changelog
 
 # Append --without-compress-install to prevent emacs from compressing info
@@ -79,6 +82,7 @@ OPTIONS_SUB=		SOURCES
 
 SOUND_CONFIGURE_OFF=	--with-sound=no
 ALSA_CONFIGURE_ON=		--with-sound=alsa
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 OSS_CONFIGURE_ON=		--with-sound=oss
 
 DBUS_LIB_DEPENDS=		libdbus-1.so:${PORTSDIR}/devel/dbus
@@ -95,6 +99,7 @@ SVG_CONFIGURE_WITH=	rsvg
 
 X11_CONFIGURE_WITH=	x
 X11_USE=	XORG=x11
+X11_USES=		desktop-file-utils
 X11_PLIST_DIRSTRY_OFF=	share/icons/hicolor/scalable/mimetypes \
 			share/icons/hicolor/scalable/apps \
 			share/icons/hicolor/scalable \

Copied and modified: head/editors/emacs-devel/files/pkg-install.in (from r372258, head/editors/emacs-devel/pkg-install)
==============================================================================
--- head/editors/emacs-devel/pkg-install	Fri Nov  7 12:46:59 2014	(r372258, copy source)
+++ head/editors/emacs-devel/files/pkg-install.in	Fri Nov  7 12:52:21 2014	(r372259)
@@ -3,12 +3,15 @@
 # $FreeBSD$
 
 GAMESROOT=/var/games/emacs
+ARCHLIBDIR=%%ARCHLIBDIR%%
 
 if [ "$2" = "POST-INSTALL" ]; then
     umask 022
     mkdir -p $GAMESROOT
     touch $GAMESROOT/snake-scores
     touch $GAMESROOT/tetris-scores
+    chown games $ARCHLIBDIR/update-game-score
+    chmod u+s $ARCHLIBDIR/update-game-score
     chown games $GAMESROOT
     chmod 775 $GAMESROOT
 fi