- Update to 1.13, announce message:

  Comment on entry to and exit from edit mode.
  Cleaned up packaging and install/uninstall productions.

- Rename from games/empire to games/vms-empire to match Upstream name
- Remove DISTNAME
- Change PLIST_FILES, changed by me and Upstream
- Remove obsolete REINPLACE
- Simplify installation handling, changed by me and Upstream
- Add REINPLACE, fix GNU/Linux paths
- Strip executable
- Change pkg-descr

8 files changed, 47 insertions, 59 deletions

diff --git a/MOVED b/MOVED
index 8bd9b68b9725..5b9c7a36ae70 100644
--- a/MOVED
+++ b/MOVED
@@ -7318,3 +7318,4 @@ www/twig-php||2014-12-08|Removed, as it was replaced and conflicting with www/pe
 net/ntp-rc|net/ntp-devel|2014-12-11|Upline uses devel and relesae candidate interchangably.
 textproc/xerces-c2|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3
 textproc/xerces-c2-devel|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3
+games/empire|games/vms-empire|2014-12-15|Moved to match upstream name
diff --git a/games/Makefile b/games/Makefile
index 35411983d9c6..bda222a60b87 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -224,7 +224,6 @@
     SUBDIR += el
     SUBDIR += el-data
     SUBDIR += ember
-    SUBDIR += empire
     SUBDIR += endgame-singularity
     SUBDIR += endgame-singularity-music
     SUBDIR += enigma
@@ -1034,6 +1033,7 @@
     SUBDIR += wmpuzzle
     SUBDIR += wmqstat
     SUBDIR += wmquake
+    SUBDIR += vms-empire
     SUBDIR += wmshuffle
     SUBDIR += wmtictactoe
     SUBDIR += wolfpack
diff --git a/games/empire/Makefile b/games/empire/Makefile
deleted file mode 100644
index 488aa5871b1d..000000000000
--- a/games/empire/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Andrey Zakhvatov
-# $FreeBSD$
-
-PORTNAME=	empire
-PORTVERSION=	1.12
-CATEGORIES=	games
-MASTER_SITES=	http://www.catb.org/~esr/vms-empire/
-DISTNAME=	vms-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	nemysis@FreeBSD.org
-COMMENT=	Simulation of a full-scale war between two emperors
-
-LICENSE=	GPLv2
-
-PORTDOCS=	AUTHORS BUGS HACKING NEWS README
-OPTIONS_DEFINE=	DOCS
-
-PLIST_FILES=	bin/${PORTNAME} \
-		man/man6/${PORTNAME}.6.gz \
-		share/applications/${PORTNAME}.desktop \
-		share/pixmaps/${PORTNAME}.png
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS|#CFLAGS| ; \
-		s|-lncurses|-lcurses|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|static void|void|g' ${WRKSRC}/game.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/vms-empire \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/empire-logo.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/games/empire/distinfo b/games/empire/distinfo
deleted file mode 100644
index 70d6988e1fb1..000000000000
--- a/games/empire/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vms-empire-1.12.tar.gz) = b3bdca36b767ba3b2b3afca9fecbb1e0ac983fb34f7c8d3c25b20423eed4c1f2
-SIZE (vms-empire-1.12.tar.gz) = 108417
diff --git a/games/empire/pkg-descr b/games/empire/pkg-descr
deleted file mode 100644
index 740070185491..000000000000
--- a/games/empire/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-VMS-Empire is a simulation of a full-scale war between two emperors,
-the computer and you. Naturally, there is only room for one, so the
-object of the game is to destroy the other. The computer plays by
-the same rules that you do.  This game is the ancestor of all the
-multiplayer 4X simulations out there, including Civilization and
-Master of Orion.
-
-Apparently, this game was originally written outside of Digital,
-probably at a university. The game was ported to DEC's VAX/VMS from
-the TOPS-10/20 FORTRAN sources available around fall 1979. Ed James
-got hold of the sources at Berkeley and converted portions of the
-code to C, mostly to use curses for the screen handling. He published
-his modified sources on the net in December 1986.  Because this
-game ran on VMS machines for so long, a previous version is known
-as VMS Empire.
-
-WWW: http://www.catb.org/~esr/vms-empire/
diff --git a/games/vms-empire/Makefile b/games/vms-empire/Makefile
new file mode 100644
index 000000000000..814a83f1393f
--- /dev/null
+++ b/games/vms-empire/Makefile
@@ -0,0 +1,35 @@
+# Created by: Andrey Zakhvatov
+# $FreeBSD$
+
+PORTNAME=	vms-empire
+PORTVERSION=	1.13
+CATEGORIES=	games
+MASTER_SITES=	http://www.catb.org/~esr/vms-empire/
+
+MAINTAINER=	nemysis@FreeBSD.org
+COMMENT=	Simulation of a full-scale war between two emperors
+
+LICENSE=	GPLv2
+
+PORTDOCS=	AUTHORS BUGS HACKING NEWS README
+OPTIONS_DEFINE=	DOCS
+
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man6/${PORTNAME}.6.gz \
+		share/appdata/${PORTNAME}.xml \
+		${DESKTOPDIR}/${PORTNAME}.desktop \
+		share/icons/hicolor/48x48/apps/${PORTNAME}.png
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CFLAGS|CFLAGS?|; \
+	s|/usr/bin|${PREFIX}/bin|; \
+	s|/usr/share/|${PREFIX}/share/|; \
+	s|/usr/local/share/man|${PREFIX}/man|' \
+	${WRKSRC}/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/games/vms-empire/distinfo b/games/vms-empire/distinfo
new file mode 100644
index 000000000000..6e1e9837481b
--- /dev/null
+++ b/games/vms-empire/distinfo
@@ -0,0 +1,2 @@
+SHA256 (vms-empire-1.13.tar.gz) = 8d461266a9d469646e9d55f74e41014babd83a93ad2e75736b1e8523bffca181
+SIZE (vms-empire-1.13.tar.gz) = 109310
diff --git a/games/vms-empire/pkg-descr b/games/vms-empire/pkg-descr
new file mode 100644
index 000000000000..f324827cab67
--- /dev/null
+++ b/games/vms-empire/pkg-descr
@@ -0,0 +1,8 @@
+The ancestor of all 4x (expand/explore/exploit/exterminate) games.
+VMS-Empire is a simulation of a full-scale war between two emperors,
+the computer and you. Naturally, there is only room for one, so the
+object of the game is to destroy the other. The computer plays by the
+same rules that you do. This game is the ancestor of all the multiplayer
+4X simulations out there, including Civilization and Master of Orion.
+
+WWW: http://www.catb.org/~esr/vms-empire/