Attachment 161248 Details for Bug 203246 – emulators_lisaem.diff

[patch] emulators_lisaem.diff

emulators_lisaem.diff (text/plain), 8.06 KB, created by tkato432 on 2015-09-21 18:34:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-21 18:34:06 UTC

Size: 8.06 KB

patch

obsolete

>diff -urN /usr/ports/emulators/lisaem/Makefile emulators/lisaem/Makefile
>--- /usr/ports/emulators/lisaem/Makefile	2015-09-17 07:25:53.233814000 +0900
>+++ emulators/lisaem/Makefile	2015-09-22 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/emulators/lisaem/Makefile 397077 2015-09-16 19:51:26Z bapt $
> 
> PORTNAME=	lisaem
>-DISTVERSION=	1.2.6
>-PORTREVISION=	9
>+PORTVERSION=	1.2.6.2
> CATEGORIES=	emulators
> MASTER_SITES=	http://lisaem.sunder.net/downloads/
> 
>@@ -12,27 +11,43 @@
> 
> BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
> 
>-LICENSE=	GPLv2 # (or later)
>+LICENSE=	GPLv2
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		tar:bzip2
> USE_WX=		2.8
>-WX_UNICODE=	yes
> 
>-DESKTOP_ENTRIES="LisaEm" "" "${DATADIR}/lisa2icon.xpm" "${PORTNAME}" "" ""
>+DESKTOP_ENTRIES="LisaEm" "" "lisaem" "lisaem" "" ""
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|%%PREFIX%%|${PREFIX}|g ; \
>-		 s|%%WX_CONFIG%%|${WX_CONFIG}|g' ${WRKSRC}/build.sh
>+		's|bash|sh| ; \
>+		 s|==|=| ; \
>+		 s|wx-config|${WX_CONFIG:T}| ; \
>+		 s|/usr/local/|${PREFIX}/| ; \
>+		 s|^function || ; \
>+		 /[Ss]trip/s|^|#|' ${WRKSRC}/build.sh
>+	@${REINPLACE_CMD} -e \
>+		's|^inline |static inline |' ${WRKSRC}/lisa/zilog8530.c
> 
> do-build:
> 	${FIND} ${WRKSRC} -type l -delete
>-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build
>+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build \
>+		--without-optimize
>+
>+post-build:
>+	${GREP} -v "^//" ${WRKSRC}/resources/lisa128x85.xpm | \
>+		${LOCALBASE}/bin/xpmtoppm | ${LOCALBASE}/bin/pnmtopng \
>+		>  ${WRKDIR}/lisaem.png
> 
> do-install:
>-	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} lisaem ${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * \
>+		${STAGEDIR}${PREFIX}/bin)
>+	(cd ${WRKDIR} && ${INSTALL_DATA} lisaem.png \
>+		${STAGEDIR}${PREFIX}/share/pixmaps)
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	(cd ${WRKSRC}/resources && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR})
>+	(cd ${WRKSRC}/resources && ${INSTALL_DATA} * \
>+		${STAGEDIR}${DATADIR})
> 	${LN} -sf lisaem ${STAGEDIR}${PREFIX}/share/LisaEm
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/emulators/lisaem/distinfo emulators/lisaem/distinfo
>--- /usr/ports/emulators/lisaem/distinfo	2015-08-24 03:50:08.705380000 +0900
>+++ emulators/lisaem/distinfo	2015-09-22 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (lisaem-1.2.6.tar.bz2) = 162b22c7123303638ad277ef7e0cd649deed46ed6f3c3f8d0400d5eb1d608a4d
>-SIZE (lisaem-1.2.6.tar.bz2) = 1937896
>+SHA256 (lisaem-1.2.6.2.tar.bz2) = e971b529da91a1cd0f61c957f4e66e87746ddb7e336907a004d1ca8d56c64c98
>+SIZE (lisaem-1.2.6.2.tar.bz2) = 1916162
>diff -urN /usr/ports/emulators/lisaem/files/patch-build.sh emulators/lisaem/files/patch-build.sh
>--- /usr/ports/emulators/lisaem/files/patch-build.sh	2015-08-24 03:50:08.708183000 +0900
>+++ emulators/lisaem/files/patch-build.sh	1970-01-01 09:00:00.000000000 +0900
>@@ -1,139 +0,0 @@
>---- ./build.sh.orig	2007-12-11 15:26:12.000000000 +0100
>-+++ ./build.sh	2010-07-14 12:13:45.217194209 +0200
>-@@ -1,4 +1,4 @@
>--#!/bin/bash
>-+#!/bin/sh
>- 
>- #### Edit these options for your system
>- 
>-@@ -44,7 +44,7 @@
>- 
>- if [ -z "$CYGWIN" ];
>- then
>-- [ "`uname`" == "CYGWIN_NT-5.0" ] && CYGWIN="`uname`"
>-+ [ "`uname`" = "CYGWIN_NT-5.0" ] && CYGWIN="`uname`"
>- fi
>- 
>- 
>-@@ -154,14 +154,14 @@
>- else
>- 
>- WXVER=0
>--case "`wx-config --version`" in
>-+case "`%%WX_CONFIG%% --version`" in
>-   2.9*|3*)
>-         echo WARNING: wxWidgets versions higher than 2.8 have not been tested.
>-         echo It might work if they are compiled with backwards compatibility.
>-         ;;
>-   2.8*) ;;
>-   *)    echo Could not find wxWidgets 2.8.0 or higher.
>--        echo Please install it and ensure that wx-config is in the path
>-+        echo Please install it and ensure that %%WX_CONFIG%% is in the path
>-         exit 1
>-   ;;
>- esac
>-@@ -169,7 +169,7 @@
>- 
>- fi
>- #$CYGWIN is pre-set.  Cache $DARWIN so we don't have to call uname over and over.
>--[ "`uname`" == "Darwin" ] && DARWIN="Darwin"
>-+[ "`uname`" = "Darwin" ] && DARWIN="Darwin"
>- 
>- # not needed on OS X
>- if [ -z "$DARWIN" ]
>-@@ -190,8 +190,8 @@
>- # purpose of this is to avoid errors on systems that have only unicode.
>- if [ -z "$CYGWIN" ]
>- then
>--  WXREL="`wx-config --release`"
>--  if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ]
>-+  WXREL="`%%WX_CONFIG%% --release`"
>-+  if [ -n "`%%WX_CONFIG%% --list | grep $WXREL | grep unicode`" ]
>-   then
>-     WITHUNICODE="--unicode=yes"
>-   fi
>-@@ -210,8 +210,8 @@
>-          PREFIX="/cygdrive/c/Program Files/Sunder.NET/LisaEm"
>-          PREFIXLIB="/cygdrive/c/Program Files/Sunder.NET/LisaEm"
>-       else
>--         PREFIX="/usr/local/bin"
>--         PREFIXLIB="/usr/local/share/"
>-+         PREFIX="%%PREFIX%%/bin"
>-+         PREFIXLIB="%%PREFIX%%/share/"
>-       fi
>-   fi
>- fi
>-@@ -230,11 +230,11 @@
>- # if the object is older than the source, it will return true.
>- ##############################################################################
>- 
>--function NEEDED()
>-+NEEDED()
>- {
>-  if [ -f $2 ]
>-  then
>--   [ "`ls -tr $2 $1 2>/dev/null| tail -1`" == "$1" ] && return 0
>-+   [ "`ls -tr $2 $1 2>/dev/null| tail -1`" = "$1" ] && return 0
>-    return 1
>-  fi
>-  return 0
>-@@ -379,8 +379,8 @@
>-                        (OS X only, doesn't work properly elsewhere)
>- --without-rawbitmap    Disables Raw bitmap access, uses wxImage::SetRGB instead
>- 					   (default for non-OS X)
>----with-unicode         Ask wx-config for a unicode build (might not yet work)
>----without-unicode      Ask wx-config for a non-unicode build (default)
>-+--with-unicode         Ask %%WX_CONFIG%% for a unicode build (might not yet work)
>-+--without-unicode      Ask %%WX_CONFIG%% for a non-unicode build (default)
>- 
>- Environment Variables you can pass:
>- 
>-@@ -462,20 +462,20 @@
>- then
>-  # many thanks to David Cecchin for finding the unicode issues fixed below.
>- 
>-- WXCONFIGFLAGS=`wx-config  --cppflags $WITHUNICODE `
>-+ WXCONFIGFLAGS=`%%WX_CONFIG%%  --cppflags $WITHUNICODE `
>-  if [ -z "$WXCONFIGFLAGS" ]
>-  then
>--    echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
>--    which wx-config
>-+    echo %%WX_CONFIG%% has failed, or returned an error.  Ensure that it exists in your path.
>-+    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"
>-- LINKOPTS="`wx-config $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
>-+ CFLAGS="$CFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS"
>-+ CXXFLAGS="$CXXFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS"
>-+ LINKOPTS="`%%WX_CONFIG%% $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
>-  if [ -z "$LINKOPTS" ]
>-  then
>--    echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
>--    which wx-config
>-+    echo %%WX_CONFIG%% has failed, or returned an error.  Ensure that it exists in your path.
>-+    which %%WX_CONFIG%%
>-     exit 3
>-  fi
>- 
>-@@ -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 [ -f ../bin/lisaem ]
>-@@ -960,8 +960,8 @@
>- then
>- 
>-   echo "Freshly compiled `du -sh lisaem`"
>--  strip lisaem${EXT}
>--  echo "Stripped `du -sh lisaem`"
>-+# strip lisaem${EXT}
>-+# echo "Stripped `du -sh lisaem`"
>- 
>-   # compress it if upx exists.
>-   if [ -z "$WITHOUTUPX"              ]; then
>diff -urN /usr/ports/emulators/lisaem/pkg-plist emulators/lisaem/pkg-plist
>--- /usr/ports/emulators/lisaem/pkg-plist	2015-08-24 03:50:08.721025000 +0900
>+++ emulators/lisaem/pkg-plist	2015-09-22 00:00:00.000000000 +0900
>@@ -1,4 +1,6 @@
>+bin/lisadiskinfo
> bin/lisaem
>+bin/lisafsh-tool
> %%DATADIR%%/Info.plist
> %%DATADIR%%/LisaEm.icns
> %%DATADIR%%/floppy0.png
>@@ -27,3 +29,4 @@
> %%DATADIR%%/power_on.png
> %%DATADIR%%/poweroffclk.wav
> share/LisaEm
>+share/pixmaps/lisaem.png

Actions: View | Diff

Attachments on bug 203246: 161248 | 165557