6 files changed, 49 insertions, 48 deletions

diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile
index 83250e24f950..359762e39a1e 100644
--- a/emulators/linux-ePSXe/Makefile
+++ b/emulators/linux-ePSXe/Makefile
@@ -5,18 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ePSXe
-PORTVERSION=	1.5.2
+PORTNAME=	epsxe
+PORTVERSION=	1.6.0
 CATEGORIES=	emulators linux
-MASTER_SITES=	http://download.epsxe.com/files/
+MASTER_SITES=	http://www.epsxe.com/files/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	epsxe152lin
+DISTNAME=	epsxe160lin
 
 MAINTAINER=	jylefort@brutele.be
 COMMENT=	A Sony Playstation emulator (Linux version)
 
-RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+# The binary is built against glibc 2.3, so we need linux_base-8.
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+		${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
+		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
+USE_X_PREFIX=	yes
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
@@ -28,45 +32,42 @@ STRIP=
 
 .include <bsd.port.pre.mk>
 
-EPSXE=		${PREFIX}/libexec/linux-epsxe
+EPSXE=		${PREFIX}/libexec/epsxe
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-SHAREDIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-
-PSEMUPRO_PLUGINS_DIR=	${LOCALBASE}/lib/linux-psemupro/plugins
-PSEMUPRO_CFGBINS_DIR=	${LOCALBASE}/libexec/linux-psemupro/cfg
-PSEMUPRO_CFGFILES_DIR=	${LOCALBASE}/share/linux-psemupro/cfg
+PSEMUPRO_PLUGINS_DIR=	${LOCALBASE}/lib/psemupro/plugins
+PSEMUPRO_CFGBINS_DIR=	${LOCALBASE}/libexec/psemupro/cfg
+PSEMUPRO_CFGFILES_DIR=	${LOCALBASE}/share/psemupro/cfg
 
 do-build:
 	${MKDIR} ${WRKSRC}/FreeBSD
 	${SED} \
 		-e "s,@EPSXE@,${EPSXE},g" \
-		-e "s,@SHAREDIR@,${SHAREDIR},g" \
+		-e "s,@DATADIR@,${DATADIR},g" \
 		-e "s,@PSEMUPRO_PLUGINS_DIR@,${PSEMUPRO_PLUGINS_DIR},g" \
 		-e "s,@PSEMUPRO_CFGBINS_DIR@,${PSEMUPRO_CFGBINS_DIR},g" \
 		-e "s,@PSEMUPRO_CFGFILES_DIR@,${PSEMUPRO_CFGFILES_DIR},g" \
-		${FILESDIR}/linux-epsxe_install.in \
-		>${WRKSRC}/FreeBSD/linux-epsxe_install
+		${FILESDIR}/epsxe-install.in \
+		>${WRKSRC}/FreeBSD/epsxe-install
 
 do-install:
 	${MKDIR} ${PREFIX}/bin
 	${INSTALL_SCRIPT} \
-		${FILESDIR}/linux-epsxe \
-		${WRKSRC}/FreeBSD/linux-epsxe_install \
+		${FILESDIR}/epsxe \
+		${WRKSRC}/FreeBSD/epsxe-install \
 		${PREFIX}/bin
 
 	${MKDIR} ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/epsxe ${EPSXE}
 
-	${MKDIR} ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/keycodes.lst ${SHAREDIR}
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/keycodes.lst ${DATADIR}
 
-	${MKDIR} ${SHAREDIR}/cheats
+	${MKDIR} ${DATADIR}/cheats
 	${INSTALL_DATA} \
 		${WRKSRC}/cheats/breath_of_fire_4_usa.cht \
 		${WRKSRC}/cheats/chrono_cross_ntsc.cht \
 		${WRKSRC}/cheats/tarzan_pal.cht \
-		${SHAREDIR}/cheats
+		${DATADIR}/cheats
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/emulators/linux-ePSXe/distinfo b/emulators/linux-ePSXe/distinfo
index e412ddcbc5fc..c9b10f060a96 100644
--- a/emulators/linux-ePSXe/distinfo
+++ b/emulators/linux-ePSXe/distinfo
@@ -1 +1 @@
-MD5 (epsxe152lin.zip) = 5834f34cb904b08d95abda057eff3981
+MD5 (epsxe160lin.zip) = 32704cfc77939b9a1bd047f22b70eca2
diff --git a/emulators/linux-ePSXe/files/linux-epsxe b/emulators/linux-ePSXe/files/epsxe
index 6c5feb96d351..b50f5f52c02a 100644
--- a/emulators/linux-ePSXe/files/linux-epsxe
+++ b/emulators/linux-ePSXe/files/epsxe
@@ -1,14 +1,14 @@
 #!/bin/sh
-# linux-epsxe - linux-ePSXe wrapper
+# epsxe - ePSXe launcher
 #
-# (c) 2002 Jean-Yves Lefort.
+# (c) 2002-2003 Jean-Yves Lefort.
 # All rights reserved.
 
-USERDIR=$HOME/.linux-ePSXe
+USERDIR=$HOME/.epsxe
 
 if [ ! -x $USERDIR/epsxe ]; then
     echo "$USERDIR/epsxe not found or not executable."
-    echo "You should run linux-epsxe_install."
+    echo "You should run epsxe-install."
     exit 1
 fi
 
diff --git a/emulators/linux-ePSXe/files/linux-epsxe_install.in b/emulators/linux-ePSXe/files/epsxe-install.in
index 3688977d6594..5c0e81eee4c8 100644
--- a/emulators/linux-ePSXe/files/linux-epsxe_install.in
+++ b/emulators/linux-ePSXe/files/epsxe-install.in
@@ -1,16 +1,16 @@
 #!/bin/sh
-# linux-epsxe_install - linux-ePSXe user installation
+# epsxe-install - ePSXe user installation
 #
-# (c) 2002 Jean-Yves Lefort.
+# (c) 2002-2003 Jean-Yves Lefort.
 # All rights reserved.
 
 EPSXE=@EPSXE@
-SHAREDIR=@SHAREDIR@
+DATADIR=@DATADIR@
 PSEMUPRO_PLUGINS_DIR=@PSEMUPRO_PLUGINS_DIR@
 PSEMUPRO_CFGBINS_DIR=@PSEMUPRO_CFGBINS_DIR@
 PSEMUPRO_CFGFILES_DIR=@PSEMUPRO_CFGFILES_DIR@
 
-USERDIR=$HOME/.linux-ePSXe
+USERDIR=$HOME/.epsxe
 
 _mkdir () {
     if [ ! -e $1 ]; then
@@ -53,7 +53,7 @@ for f in				\
     cheats/breath_of_fire_4_usa.cht	\
     cheats/chrono_cross_ntsc.cht	\
     cheats/tarzan_pal.cht; do
-    _ln $SHAREDIR/$f $USERDIR/$f || exit $?
+    _ln $DATADIR/$f $USERDIR/$f || exit $?
 done
 
 for p in $PSEMUPRO_PLUGINS_DIR/*; do
diff --git a/emulators/linux-ePSXe/pkg-message b/emulators/linux-ePSXe/pkg-message
index 840d56a93ede..44c607c3a89c 100644
--- a/emulators/linux-ePSXe/pkg-message
+++ b/emulators/linux-ePSXe/pkg-message
@@ -1,9 +1,9 @@
 -------------------------------------------------------------------------------
 You should now log into your normal user account and issue a
 
-	linux-epsxe_install
+	epsxe-install
 
-in order to create and populate ~/.ePSXe, needed to run the program.
+in order to create and populate ~/.epsxe, needed to run the program.
 
 To do anything useful with the emulator, you'll need a GPU and a SPU
 plugin (the Ports Collection contains a number of those), and a
@@ -19,7 +19,7 @@ you're legally entitled to do so.
 When you install a PSEmu Pro plugin from a FreeBSD port or package,
 you should re-run
 
-	linux-epsxe_install
+	epsxe-install
 
 in order to make the plugin available to ePSXe.
 -------------------------------------------------------------------------------
diff --git a/emulators/linux-ePSXe/pkg-plist b/emulators/linux-ePSXe/pkg-plist
index ef8c303d823d..a02f45649850 100644
--- a/emulators/linux-ePSXe/pkg-plist
+++ b/emulators/linux-ePSXe/pkg-plist
@@ -1,14 +1,14 @@
-bin/linux-epsxe
-bin/linux-epsxe_install
-libexec/linux-epsxe
-share/linux-ePSXe/keycodes.lst
-share/linux-ePSXe/cheats/breath_of_fire_4_usa.cht
-share/linux-ePSXe/cheats/chrono_cross_ntsc.cht
-share/linux-ePSXe/cheats/tarzan_pal.cht
-%%PORTDOCS%%share/doc/linux-ePSXe/epsxe_en.txt
-%%PORTDOCS%%share/doc/linux-ePSXe/epsxe_linux_en.txt
-%%PORTDOCS%%share/doc/linux-ePSXe/epsxe_linux_sp.txt
-%%PORTDOCS%%share/doc/linux-ePSXe/epsxe_sp.txt
-@dirrm share/linux-ePSXe/cheats
-@dirrm share/linux-ePSXe
-%%PORTDOCS%%@dirrm share/doc/linux-ePSXe
+bin/epsxe
+bin/epsxe-install
+libexec/epsxe
+share/epsxe/keycodes.lst
+share/epsxe/cheats/breath_of_fire_4_usa.cht
+share/epsxe/cheats/chrono_cross_ntsc.cht
+share/epsxe/cheats/tarzan_pal.cht
+%%PORTDOCS%%%%DOCSDIR%%/epsxe_en.txt
+%%PORTDOCS%%%%DOCSDIR%%/epsxe_linux_en.txt
+%%PORTDOCS%%%%DOCSDIR%%/epsxe_linux_sp.txt
+%%PORTDOCS%%%%DOCSDIR%%/epsxe_sp.txt
+@dirrm share/epsxe/cheats
+@dirrm share/epsxe
+%%PORTDOCS%%@dirrm %%DOCSDIR%%