svn commit: r364084 - in head/editors: emacs emacs-nox11
Ashish SHUKLA
ashish at FreeBSD.org
Tue Aug 5 09:09:28 UTC 2014
Author: ashish
Date: Tue Aug 5 09:09:26 2014
New Revision: 364084
URL: http://svnweb.freebsd.org/changeset/ports/364084
QAT: https://qat.redports.org/buildarchive/r364084/
Log:
- Move /var/games/emacs stuff from pkg-plist into pkg-{de,}install as it's
not installed in $PREFIX, which causes issues with `check-plist' target
- Remove extraneous @dirrmtry entries
- Bump PORTREVISION due to pkg-plist change
Reported by: rpaulo
Added:
head/editors/emacs/pkg-deinstall (contents, props changed)
head/editors/emacs/pkg-install (contents, props changed)
Modified:
head/editors/emacs-nox11/Makefile
head/editors/emacs/Makefile
head/editors/emacs/pkg-plist
Modified: head/editors/emacs-nox11/Makefile
==============================================================================
--- head/editors/emacs-nox11/Makefile Tue Aug 5 07:52:48 2014 (r364083)
+++ head/editors/emacs-nox11/Makefile Tue Aug 5 09:09:26 2014 (r364084)
@@ -3,7 +3,7 @@
PKGNAMESUFFIX= -nox11
-PORTREVISION= 11
+PORTREVISION= 12
OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile Tue Aug 5 07:52:48 2014 (r364083)
+++ head/editors/emacs/Makefile Tue Aug 5 09:09:26 2014 (r364084)
@@ -3,7 +3,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION?= 6
+PORTREVISION?= 7
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -230,8 +230,9 @@ add-plist-data:
.endfor
@${ECHO} "@unexec rmdir %D/${DATADIR_REL}/${EMACS_VER} 2>/dev/null || true" >>${TMPPLIST}
-.if ${PORT_OPTIONS:MSOURCES}
post-install:
+ @${RM} -rf ${STAGEDIR}/var/games/emacs
+.if ${PORT_OPTIONS:MSOURCES}
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
@${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
Added: head/editors/emacs/pkg-deinstall
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/emacs/pkg-deinstall Tue Aug 5 09:09:26 2014 (r364084)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+GAMESROOT=/var/games/emacs
+
+if [ "$2" = "DEINSTALL" ]; then
+ for s in snake tetris; do
+ if [ ! -s $GAMESROOT/$s-scores ]; then
+ rm -f $GAMESROOT/$s-scores
+ fi
+ done
+ rmdir $GAMESROOT 2>/dev/null
+fi
+
+exit 0
Added: head/editors/emacs/pkg-install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/emacs/pkg-install Tue Aug 5 09:09:26 2014 (r364084)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+GAMESROOT=/var/games/emacs
+
+if [ "$2" = "POST-INSTALL" ]; then
+ umask 022
+ mkdir -p $GAMESROOT
+ touch $GAMESROOT/snake-scores
+ touch $GAMESROOT/tetris-scores
+ chown games $GAMESROOT
+ chmod 775 $GAMESROOT
+fi
+
+exit 0
Modified: head/editors/emacs/pkg-plist
==============================================================================
--- head/editors/emacs/pkg-plist Tue Aug 5 07:52:48 2014 (r364083)
+++ head/editors/emacs/pkg-plist Tue Aug 5 09:09:26 2014 (r364084)
@@ -25,21 +25,3 @@ share/icons/hicolor/scalable/apps/emacs.
share/icons/hicolor/scalable/mimetypes/emacs-document.svg
@dirrmtry %%INFODIR%%
@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
- at dirrmtry share/icons/hicolor/scalable/mimetypes
- at dirrmtry share/icons/hicolor/scalable/apps
- at dirrmtry share/icons/hicolor/scalable
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/24x24/apps
- at dirrmtry share/icons/hicolor/24x24
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
- at unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
- at unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
- at unexec rmdir /var/games/emacs 2>/dev/null || true
More information about the svn-ports-all
mailing list