diff options
| -rw-r--r-- | emulators/lisaem/Makefile | 11 | ||||
| -rw-r--r-- | emulators/lisaem/distinfo | 6 | ||||
| -rw-r--r-- | emulators/lisaem/files/patch-build.sh | 24 | ||||
| -rw-r--r-- | emulators/lisaem/pkg-plist | 67 |
4 files changed, 51 insertions, 57 deletions
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile index f10d9906b29e..927242eb8fd4 100644 --- a/emulators/lisaem/Makefile +++ b/emulators/lisaem/Makefile @@ -6,9 +6,9 @@ # PORTNAME= lisaem -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.6 CATEGORIES= emulators -MASTER_SITES= http://lisa.sunder.net/20070923/ +MASTER_SITES= http://lisaem.sunder.net/downloads/ MAINTAINER= trasz@FreeBSD.org COMMENT= Apple Lisa 2 Emulator @@ -26,8 +26,11 @@ do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash build.sh build do-install: + @# This file is a symlink to itself; result of mistyped command? + ${RM} -f ${WRKSRC}/resources/resources ${INSTALL_PROGRAM} ${WRKSRC}/bin/lisaem ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/LisaEm - ${INSTALL_DATA} ${WRKSRC}/resources/* ${PREFIX}/share/LisaEm/ + ${MKDIR} ${PREFIX}/share/lisaem + ${INSTALL_DATA} ${WRKSRC}/resources/* ${PREFIX}/share/lisaem/ + ${LN} -sf ${PREFIX}/share/lisaem ${PREFIX}/share/LisaEm .include <bsd.port.mk> diff --git a/emulators/lisaem/distinfo b/emulators/lisaem/distinfo index 82bea6e5520b..8eeb79d49e86 100644 --- a/emulators/lisaem/distinfo +++ b/emulators/lisaem/distinfo @@ -1,3 +1,3 @@ -MD5 (lisaem-1.2.0.tar.bz2) = ab20a4b59837b81c43bda2c756406ab7 -SHA256 (lisaem-1.2.0.tar.bz2) = d046c9c73518296b7fc2ffef494a1580e7650314dfed169b7a1cc6bd7dabaa0d -SIZE (lisaem-1.2.0.tar.bz2) = 1962774 +MD5 (lisaem-1.2.6.tar.bz2) = b236d7fa06c7589bb0de5d13ed680c9a +SHA256 (lisaem-1.2.6.tar.bz2) = 162b22c7123303638ad277ef7e0cd649deed46ed6f3c3f8d0400d5eb1d608a4d +SIZE (lisaem-1.2.6.tar.bz2) = 1937896 diff --git a/emulators/lisaem/files/patch-build.sh b/emulators/lisaem/files/patch-build.sh index eebea7162ab1..171bc2dc0332 100644 --- a/emulators/lisaem/files/patch-build.sh +++ b/emulators/lisaem/files/patch-build.sh @@ -1,22 +1,22 @@ ---- build.sh.orig 2007-07-10 05:23:23.000000000 +0200 -+++ build.sh 2007-09-25 08:25:06.000000000 +0200 -@@ -426,8 +426,8 @@ - then - # many thanks to David Cecchin for finding the unicode issues fixed below. - WXCONFIGFLAGS=`wx-config --cppflags --unicode=no ` +--- build.sh.orig 2007-12-11 15:26:12.000000000 +0100 ++++ build.sh 2007-12-13 23:24:15.000000000 +0100 +@@ -469,8 +469,8 @@ + which wx-config + exit 3 + fi - CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" - CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG" + CFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" + CXXFLAGS+=" -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS" - LINKOPTS="`wx-config $STATIC --unicode=no --libs --linkdeps --cppflags`" - [ -z "$CC" ] && CC=gcc - [ -z "$CXX" ] && CXX=g++ -@@ -768,7 +768,7 @@ - #echo $CXX $GCCSTATIC $WITHDEBUG -o lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS + LINKOPTS="`wx-config $STATIC $WITHUNICODE --libs --linkdeps --cppflags`" + if [ -z "$LINKOPTS" ] + then +@@ -840,7 +840,7 @@ + #echo $CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS if [ -z "$WITHWXUI" ] then -$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS 2>&1 | head -20 +$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS 2>&1 | head -20 fi - ## if [ -n "$WITHWXUI" ] + if [ -f ../bin/lisaem ] diff --git a/emulators/lisaem/pkg-plist b/emulators/lisaem/pkg-plist index 6df262c6dc4e..e9248f064bd1 100644 --- a/emulators/lisaem/pkg-plist +++ b/emulators/lisaem/pkg-plist @@ -1,39 +1,30 @@ bin/lisaem -share/LisaEm/Info.plist -share/LisaEm/LisaEm.icns -share/LisaEm/floppy0.png -share/LisaEm/floppy0.xpm -share/LisaEm/floppy1.png -share/LisaEm/floppy1.xpm -share/LisaEm/floppy2.png -share/LisaEm/floppy2.xpm -share/LisaEm/floppy3.png -share/LisaEm/floppy3.xpm -share/LisaEm/floppyN.png -share/LisaEm/floppyN.xpm -share/LisaEm/floppy_eject.wav -share/LisaEm/floppy_insert_sound.wav -share/LisaEm/floppy_motor1.wav -share/LisaEm/floppy_motor2.wav -share/LisaEm/lisa128x85.xpm -share/LisaEm/lisa2icon.xpm.old -share/LisaEm/lisa2icon.ico -share/LisaEm/lisa2icon.xpm -share/LisaEm/lisa_power_switch01.wav -share/LisaEm/lisa_power_switch02.wav -share/LisaEm/lisaem.ico -share/LisaEm/lisaem.exe.Manifest -share/LisaEm/lisaface0.png -share/LisaEm/lisaface0.xpm -share/LisaEm/lisaface1.png -share/LisaEm/lisaface1.xpm -share/LisaEm/lisaface2.png -share/LisaEm/lisaface2.xpm -share/LisaEm/lisaface3.png -share/LisaEm/lisaface3.xpm -share/LisaEm/power_off.png -share/LisaEm/power_off.xpm -share/LisaEm/power_on.png -share/LisaEm/power_on.xpm -share/LisaEm/poweroffclk.wav -@dirrm share/LisaEm +share/lisaem/Info.plist +share/lisaem/LisaEm.icns +share/lisaem/floppy0.png +share/lisaem/floppy1.png +share/lisaem/floppy2.png +share/lisaem/floppy3.png +share/lisaem/floppyN.png +share/lisaem/floppy_eject.wav +share/lisaem/floppy_insert_sound.wav +share/lisaem/floppy_motor1.wav +share/lisaem/floppy_motor2.wav +share/lisaem/lisa128x85.xpm +share/lisaem/lisa2icon.ico +share/lisaem/lisa2icon.ico.old +share/lisaem/lisa2icon.xpm +share/lisaem/lisa_power_switch01.wav +share/lisaem/lisa_power_switch02.wav +share/lisaem/lisaem.exe.Manifest +share/lisaem/lisaem.ico +share/lisaem/lisaem.ico.old +share/lisaem/lisaface0.png +share/lisaem/lisaface1.png +share/lisaem/lisaface2.png +share/lisaem/lisaface3.png +share/lisaem/power_off.png +share/lisaem/power_on.png +share/lisaem/poweroffclk.wav +@dirrm share/lisaem +share/LisaEm |