- 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

5 files changed, 36 insertions, 21 deletions

diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index dec777dcb1ec..4976b2354399 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -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 \
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 08c609230c11..937d9c59b5e4 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -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
diff --git a/editors/emacs/pkg-deinstall b/editors/emacs/pkg-deinstall
new file mode 100644
index 000000000000..62e66bbdd487
--- /dev/null
+++ b/editors/emacs/pkg-deinstall
@@ -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
diff --git a/editors/emacs/pkg-install b/editors/emacs/pkg-install
new file mode 100644
index 000000000000..70280bfdbbd7
--- /dev/null
+++ b/editors/emacs/pkg-install
@@ -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
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 04c96940ca70..e6dc5ea4c41f 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -25,21 +25,3 @@ share/icons/hicolor/scalable/apps/emacs.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 @dirrmtry %%INFODIR%%
 @dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
-@dirrmtry share/icons/hicolor/scalable/mimetypes
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@unexec if [ ! -s /var/games/emacs/snake-scores ]; then rm -f /var/games/emacs/snake-scores; fi
-@unexec if [ ! -s /var/games/emacs/tetris-scores ]; then rm -f /var/games/emacs/tetris-scores; fi
-@unexec rmdir /var/games/emacs 2>/dev/null || true