svn commit: r372258 - in head/editors/emacs: . files
Ashish SHUKLA
ashish at FreeBSD.org
Fri Nov 7 12:47:00 UTC 2014
Author: ashish
Date: Fri Nov 7 12:46:59 2014
New Revision: 372258
URL: https://svnweb.freebsd.org/changeset/ports/372258
QAT: https://qat.redports.org/buildarchive/r372258/
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 only 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/files/pkg-install.in
- copied, changed from r372253, head/editors/emacs/pkg-install
Deleted:
head/editors/emacs/pkg-install
Modified:
head/editors/emacs/Makefile
Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile Fri Nov 7 12:16:48 2014 (r372257)
+++ head/editors/emacs/Makefile Fri Nov 7 12:46:59 2014 (r372258)
@@ -3,6 +3,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -25,11 +26,14 @@ CONFLICTS= emacs-19.* emacs21-[0-9]* ema
EMACS_VER= 24.4
GNU_CONFIGURE= yes
-USES= desktop-file-utils gmake makeinfo ncurses pkgconfig shebangfix tar:xz
+USES= gmake makeinfo ncurses pkgconfig shebangfix tar:xz
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INFO_PATH= ${DATADIR_REL}/info
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+SUB_FILES= pkg-install
+SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
SHEBANG_FILES= lib-src/grep-changelog
# Append --without-compress-install to prevent emacs from compressing info
@@ -90,6 +94,7 @@ CANNA_LIB_DEPENDS= libcanna.so:${PORTSDI
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
@@ -106,6 +111,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/files/pkg-install.in (from r372253, head/editors/emacs/pkg-install)
==============================================================================
--- head/editors/emacs/pkg-install Fri Nov 7 10:51:33 2014 (r372253, copy source)
+++ head/editors/emacs/files/pkg-install.in Fri Nov 7 12:46:59 2014 (r372258)
@@ -1,10 +1,19 @@
#!/bin/sh
+# $FreeBSD$
+
GAMESROOT=/var/games/emacs
+ARCHLIBDIR=%%ARCHLIBDIR%%
if [ "$2" = "POST-INSTALL" ]; then
- touch $GAMESROOT/snake-scores
- touch $GAMESROOT/tetris-scores
+ 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
exit 0
More information about the svn-ports-head
mailing list