From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 25 01:40:30 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C36DE16A4CF for ; Tue, 25 Nov 2003 01:40:30 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1FDE43FEC for ; Tue, 25 Nov 2003 01:40:20 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAP9eKFY069301 for ; Tue, 25 Nov 2003 01:40:20 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAP9eKLu069300; Tue, 25 Nov 2003 01:40:20 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 25 Nov 2003 01:40:20 -0800 (PST) Resent-Message-Id: <200311250940.hAP9eKLu069300@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jean-Yves Lefort Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9394816A4CF for ; Tue, 25 Nov 2003 01:34:57 -0800 (PST) Received: from gateway.lefort.net (213.189.162.78.brutele.be [213.189.162.78]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9576643F75 for ; Tue, 25 Nov 2003 01:34:54 -0800 (PST) (envelope-from jylefort@brutele.be) Received: from jsite.lefort.net (jsite.lefort.net [192.168.1.2]) by gateway.lefort.net (Postfix) with ESMTP id 740F254EA for ; Tue, 25 Nov 2003 10:34:52 +0100 (CET) Received: by jsite.lefort.net (Postfix, from userid 1000) id 1AAF922E1B; Tue, 25 Nov 2003 10:34:52 +0100 (CET) Message-Id: <20031125093452.1AAF922E1B@jsite.lefort.net> Date: Tue, 25 Nov 2003 10:34:52 +0100 (CET) From: Jean-Yves Lefort To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/59670: Update port: emulators/linux-ePSXe to 1.6.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jean-Yves Lefort List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2003 09:40:30 -0000 >Number: 59670 >Category: ports >Synopsis: Update port: emulators/linux-ePSXe to 1.6.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Nov 25 01:40:20 PST 2003 >Closed-Date: >Last-Modified: >Originator: Jean-Yves Lefort >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: System: FreeBSD jsite.lefort.net 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Wed Oct 29 13:50:04 CET 2003 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386 >Description: Note that I renamed the port to emulators/linux-epsxe, in lower-case. >How-To-Repeat: >Fix: diff -ruN /usr/ports/emulators/linux-ePSXe/Makefile linux-epsxe/Makefile --- /usr/ports/emulators/linux-ePSXe/Makefile Sat Feb 22 07:21:22 2003 +++ linux-epsxe/Makefile Tue Nov 25 10:27:19 2003 @@ -2,21 +2,25 @@ # Date created: 21 Dec 2002 # Whom: Jean-Yves Lefort # -# $FreeBSD: ports/emulators/linux-ePSXe/Makefile,v 1.2 2003/02/21 11:58:59 knu Exp $ +# $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 @@ .include -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 -ruN /usr/ports/emulators/linux-ePSXe/distinfo linux-epsxe/distinfo --- /usr/ports/emulators/linux-ePSXe/distinfo Sun Jan 12 03:47:35 2003 +++ linux-epsxe/distinfo Tue Nov 25 08:34:30 2003 @@ -1 +1 @@ -MD5 (epsxe152lin.zip) = 5834f34cb904b08d95abda057eff3981 +MD5 (epsxe160lin.zip) = 32704cfc77939b9a1bd047f22b70eca2 diff -ruN /usr/ports/emulators/linux-ePSXe/files/epsxe linux-epsxe/files/epsxe --- /usr/ports/emulators/linux-ePSXe/files/epsxe Thu Jan 1 01:00:00 1970 +++ linux-epsxe/files/epsxe Tue Nov 25 10:04:55 2003 @@ -0,0 +1,15 @@ +#!/bin/sh +# epsxe - ePSXe launcher +# +# (c) 2002-2003 Jean-Yves Lefort. +# All rights reserved. + +USERDIR=$HOME/.epsxe + +if [ ! -x $USERDIR/epsxe ]; then + echo "$USERDIR/epsxe not found or not executable." + echo "You should run epsxe-install." + exit 1 +fi + +cd $USERDIR && exec ./epsxe "$@" diff -ruN /usr/ports/emulators/linux-ePSXe/files/epsxe-install.in linux-epsxe/files/epsxe-install.in --- /usr/ports/emulators/linux-ePSXe/files/epsxe-install.in Thu Jan 1 01:00:00 1970 +++ linux-epsxe/files/epsxe-install.in Tue Nov 25 10:16:14 2003 @@ -0,0 +1,72 @@ +#!/bin/sh +# epsxe-install - ePSXe user installation +# +# (c) 2002-2003 Jean-Yves Lefort. +# All rights reserved. + +EPSXE=@EPSXE@ +DATADIR=@DATADIR@ +PSEMUPRO_PLUGINS_DIR=@PSEMUPRO_PLUGINS_DIR@ +PSEMUPRO_CFGBINS_DIR=@PSEMUPRO_CFGBINS_DIR@ +PSEMUPRO_CFGFILES_DIR=@PSEMUPRO_CFGFILES_DIR@ + +USERDIR=$HOME/.epsxe + +_mkdir () { + if [ ! -e $1 ]; then + echo "Creating directory $1" + mkdir -p $1 + fi +} + +_ln () { + if [ ! -e $2 ]; then + echo "Creating symlink $2" + ln -sf $1 $2 + fi +} + +_install () { + if [ ! -e $2 ]; then + echo "Copying $1 to $2" + install -m $3 $1 $2 + fi +} + +for d in \ + $USERDIR \ + $USERDIR/bios \ + $USERDIR/cfg \ + $USERDIR/cheats \ + $USERDIR/memcards \ + $USERDIR/patches \ + $USERDIR/plugins \ + $USERDIR/snap \ + $USERDIR/sstates; do + _mkdir $d || exit $? +done + +_ln $EPSXE $USERDIR/epsxe || exit $? + +for f in \ + keycodes.lst \ + cheats/breath_of_fire_4_usa.cht \ + cheats/chrono_cross_ntsc.cht \ + cheats/tarzan_pal.cht; do + _ln $DATADIR/$f $USERDIR/$f || exit $? +done + +for p in $PSEMUPRO_PLUGINS_DIR/*; do + [ -e $p ] || break + _ln $p $USERDIR/plugins/`basename $p` || exit $? +done + +for c in $PSEMUPRO_CFGBINS_DIR/*; do + [ -e $c ] || break + _ln $c $USERDIR/cfg/`basename $c` || exit $? +done + +for c in $PSEMUPRO_CFGFILES_DIR/*; do + [ -e $c ] || break + _install $c $USERDIR/cfg/`basename $c` 0644 || exit $? +done diff -ruN /usr/ports/emulators/linux-ePSXe/files/linux-epsxe linux-epsxe/files/linux-epsxe --- /usr/ports/emulators/linux-ePSXe/files/linux-epsxe Sun Jan 12 03:47:35 2003 +++ linux-epsxe/files/linux-epsxe Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ -#!/bin/sh -# linux-epsxe - linux-ePSXe wrapper -# -# (c) 2002 Jean-Yves Lefort. -# All rights reserved. - -USERDIR=$HOME/.linux-ePSXe - -if [ ! -x $USERDIR/epsxe ]; then - echo "$USERDIR/epsxe not found or not executable." - echo "You should run linux-epsxe_install." - exit 1 -fi - -cd $USERDIR && exec ./epsxe "$@" diff -ruN /usr/ports/emulators/linux-ePSXe/files/linux-epsxe_install.in linux-epsxe/files/linux-epsxe_install.in --- /usr/ports/emulators/linux-ePSXe/files/linux-epsxe_install.in Sun Jan 12 03:47:35 2003 +++ linux-epsxe/files/linux-epsxe_install.in Thu Jan 1 01:00:00 1970 @@ -1,72 +0,0 @@ -#!/bin/sh -# linux-epsxe_install - linux-ePSXe user installation -# -# (c) 2002 Jean-Yves Lefort. -# All rights reserved. - -EPSXE=@EPSXE@ -SHAREDIR=@SHAREDIR@ -PSEMUPRO_PLUGINS_DIR=@PSEMUPRO_PLUGINS_DIR@ -PSEMUPRO_CFGBINS_DIR=@PSEMUPRO_CFGBINS_DIR@ -PSEMUPRO_CFGFILES_DIR=@PSEMUPRO_CFGFILES_DIR@ - -USERDIR=$HOME/.linux-ePSXe - -_mkdir () { - if [ ! -e $1 ]; then - echo "Creating directory $1" - mkdir -p $1 - fi -} - -_ln () { - if [ ! -e $2 ]; then - echo "Creating symlink $2" - ln -sf $1 $2 - fi -} - -_install () { - if [ ! -e $2 ]; then - echo "Copying $1 to $2" - install -m $3 $1 $2 - fi -} - -for d in \ - $USERDIR \ - $USERDIR/bios \ - $USERDIR/cfg \ - $USERDIR/cheats \ - $USERDIR/memcards \ - $USERDIR/patches \ - $USERDIR/plugins \ - $USERDIR/snap \ - $USERDIR/sstates; do - _mkdir $d || exit $? -done - -_ln $EPSXE $USERDIR/epsxe || exit $? - -for f in \ - keycodes.lst \ - cheats/breath_of_fire_4_usa.cht \ - cheats/chrono_cross_ntsc.cht \ - cheats/tarzan_pal.cht; do - _ln $SHAREDIR/$f $USERDIR/$f || exit $? -done - -for p in $PSEMUPRO_PLUGINS_DIR/*; do - [ -e $p ] || break - _ln $p $USERDIR/plugins/`basename $p` || exit $? -done - -for c in $PSEMUPRO_CFGBINS_DIR/*; do - [ -e $c ] || break - _ln $c $USERDIR/cfg/`basename $c` || exit $? -done - -for c in $PSEMUPRO_CFGFILES_DIR/*; do - [ -e $c ] || break - _install $c $USERDIR/cfg/`basename $c` 0644 || exit $? -done diff -ruN /usr/ports/emulators/linux-ePSXe/pkg-message linux-epsxe/pkg-message --- /usr/ports/emulators/linux-ePSXe/pkg-message Sun Jan 12 03:47:35 2003 +++ linux-epsxe/pkg-message Tue Nov 25 10:03:15 2003 @@ -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 @@ 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 -ruN /usr/ports/emulators/linux-ePSXe/pkg-plist linux-epsxe/pkg-plist --- /usr/ports/emulators/linux-ePSXe/pkg-plist Sun Jan 12 03:47:35 2003 +++ linux-epsxe/pkg-plist Tue Nov 25 10:03:46 2003 @@ -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%%share/doc/epsxe/epsxe_en.txt +%%PORTDOCS%%share/doc/epsxe/epsxe_linux_en.txt +%%PORTDOCS%%share/doc/epsxe/epsxe_linux_sp.txt +%%PORTDOCS%%share/doc/epsxe/epsxe_sp.txt +@dirrm share/epsxe/cheats +@dirrm share/epsxe +%%PORTDOCS%%@dirrm share/doc/epsxe >Release-Note: >Audit-Trail: >Unformatted: