View | Details | Raw Unified | Return to bug 203246 | Differences between
and this patch

Collapse All | Expand All

(-)emulators/lisaem/Makefile (-10 / +25 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/emulators/lisaem/Makefile 397077 2015-09-16 19:51:26Z bapt $
2
# $FreeBSD: head/emulators/lisaem/Makefile 397077 2015-09-16 19:51:26Z bapt $
3
3
4
PORTNAME=	lisaem
4
PORTNAME=	lisaem
5
DISTVERSION=	1.2.6
5
PORTVERSION=	1.2.6.2
6
PORTREVISION=	9
7
CATEGORIES=	emulators
6
CATEGORIES=	emulators
8
MASTER_SITES=	http://lisaem.sunder.net/downloads/
7
MASTER_SITES=	http://lisaem.sunder.net/downloads/
9
8
Lines 12-38 Link Here
12
11
13
BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
12
BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
14
13
15
LICENSE=	GPLv2 # (or later)
14
LICENSE=	GPLv2
15
#LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
USES=		tar:bzip2
17
USES=		tar:bzip2
18
USE_WX=		2.8
18
USE_WX=		2.8
19
WX_UNICODE=	yes
20
19
21
DESKTOP_ENTRIES="LisaEm" "" "${DATADIR}/lisa2icon.xpm" "${PORTNAME}" "" ""
20
DESKTOP_ENTRIES="LisaEm" "" "lisaem" "lisaem" "" ""
22
21
23
post-patch:
22
post-patch:
24
	@${REINPLACE_CMD} -e \
23
	@${REINPLACE_CMD} -e \
25
		's|%%PREFIX%%|${PREFIX}|g ; \
24
		's|bash|sh| ; \
26
		 s|%%WX_CONFIG%%|${WX_CONFIG}|g' ${WRKSRC}/build.sh
25
		 s|==|=| ; \
26
		 s|wx-config|${WX_CONFIG:T}| ; \
27
		 s|/usr/local/|${PREFIX}/| ; \
28
		 s|^function || ; \
29
		 /[Ss]trip/s|^|#|' ${WRKSRC}/build.sh
30
	@${REINPLACE_CMD} -e \
31
		's|^inline |static inline |' ${WRKSRC}/lisa/zilog8530.c
27
32
28
do-build:
33
do-build:
29
	${FIND} ${WRKSRC} -type l -delete
34
	${FIND} ${WRKSRC} -type l -delete
30
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build
35
	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build.sh build \
36
		--without-optimize
37
38
post-build:
39
	${GREP} -v "^//" ${WRKSRC}/resources/lisa128x85.xpm | \
40
		${LOCALBASE}/bin/xpmtoppm | ${LOCALBASE}/bin/pnmtopng \
41
		>  ${WRKDIR}/lisaem.png
31
42
32
do-install:
43
do-install:
33
	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} lisaem ${STAGEDIR}${PREFIX}/bin)
44
	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * \
45
		${STAGEDIR}${PREFIX}/bin)
46
	(cd ${WRKDIR} && ${INSTALL_DATA} lisaem.png \
47
		${STAGEDIR}${PREFIX}/share/pixmaps)
34
	@${MKDIR} ${STAGEDIR}${DATADIR}
48
	@${MKDIR} ${STAGEDIR}${DATADIR}
35
	(cd ${WRKSRC}/resources && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR})
49
	(cd ${WRKSRC}/resources && ${INSTALL_DATA} * \
50
		${STAGEDIR}${DATADIR})
36
	${LN} -sf lisaem ${STAGEDIR}${PREFIX}/share/LisaEm
51
	${LN} -sf lisaem ${STAGEDIR}${PREFIX}/share/LisaEm
37
52
38
.include <bsd.port.mk>
53
.include <bsd.port.mk>
(-)emulators/lisaem/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (lisaem-1.2.6.tar.bz2) = 162b22c7123303638ad277ef7e0cd649deed46ed6f3c3f8d0400d5eb1d608a4d
1
SHA256 (lisaem-1.2.6.2.tar.bz2) = e971b529da91a1cd0f61c957f4e66e87746ddb7e336907a004d1ca8d56c64c98
2
SIZE (lisaem-1.2.6.tar.bz2) = 1937896
2
SIZE (lisaem-1.2.6.2.tar.bz2) = 1916162
(-)emulators/lisaem/files/patch-build.sh (-139 lines)
Lines 1-139 Link Here
1
--- ./build.sh.orig	2007-12-11 15:26:12.000000000 +0100
2
+++ ./build.sh	2010-07-14 12:13:45.217194209 +0200
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/bin/sh
6
 
7
 #### Edit these options for your system
8
 
9
@@ -44,7 +44,7 @@
10
 
11
 if [ -z "$CYGWIN" ];
12
 then
13
- [ "`uname`" == "CYGWIN_NT-5.0" ] && CYGWIN="`uname`"
14
+ [ "`uname`" = "CYGWIN_NT-5.0" ] && CYGWIN="`uname`"
15
 fi
16
 
17
 
18
@@ -154,14 +154,14 @@
19
 else
20
 
21
 WXVER=0
22
-case "`wx-config --version`" in
23
+case "`%%WX_CONFIG%% --version`" in
24
   2.9*|3*)
25
         echo WARNING: wxWidgets versions higher than 2.8 have not been tested.
26
         echo It might work if they are compiled with backwards compatibility.
27
         ;;
28
   2.8*) ;;
29
   *)    echo Could not find wxWidgets 2.8.0 or higher.
30
-        echo Please install it and ensure that wx-config is in the path
31
+        echo Please install it and ensure that %%WX_CONFIG%% is in the path
32
         exit 1
33
   ;;
34
 esac
35
@@ -169,7 +169,7 @@
36
 
37
 fi
38
 #$CYGWIN is pre-set.  Cache $DARWIN so we don't have to call uname over and over.
39
-[ "`uname`" == "Darwin" ] && DARWIN="Darwin"
40
+[ "`uname`" = "Darwin" ] && DARWIN="Darwin"
41
 
42
 # not needed on OS X
43
 if [ -z "$DARWIN" ]
44
@@ -190,8 +190,8 @@
45
 # purpose of this is to avoid errors on systems that have only unicode.
46
 if [ -z "$CYGWIN" ]
47
 then
48
-  WXREL="`wx-config --release`"
49
-  if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ]
50
+  WXREL="`%%WX_CONFIG%% --release`"
51
+  if [ -n "`%%WX_CONFIG%% --list | grep $WXREL | grep unicode`" ]
52
   then
53
     WITHUNICODE="--unicode=yes"
54
   fi
55
@@ -210,8 +210,8 @@
56
          PREFIX="/cygdrive/c/Program Files/Sunder.NET/LisaEm"
57
          PREFIXLIB="/cygdrive/c/Program Files/Sunder.NET/LisaEm"
58
       else
59
-         PREFIX="/usr/local/bin"
60
-         PREFIXLIB="/usr/local/share/"
61
+         PREFIX="%%PREFIX%%/bin"
62
+         PREFIXLIB="%%PREFIX%%/share/"
63
       fi
64
   fi
65
 fi
66
@@ -230,11 +230,11 @@
67
 # if the object is older than the source, it will return true.
68
 ##############################################################################
69
 
70
-function NEEDED()
71
+NEEDED()
72
 {
73
  if [ -f $2 ]
74
  then
75
-   [ "`ls -tr $2 $1 2>/dev/null| tail -1`" == "$1" ] && return 0
76
+   [ "`ls -tr $2 $1 2>/dev/null| tail -1`" = "$1" ] && return 0
77
    return 1
78
  fi
79
  return 0
80
@@ -379,8 +379,8 @@
81
                        (OS X only, doesn't work properly elsewhere)
82
 --without-rawbitmap    Disables Raw bitmap access, uses wxImage::SetRGB instead
83
 					   (default for non-OS X)
84
---with-unicode         Ask wx-config for a unicode build (might not yet work)
85
---without-unicode      Ask wx-config for a non-unicode build (default)
86
+--with-unicode         Ask %%WX_CONFIG%% for a unicode build (might not yet work)
87
+--without-unicode      Ask %%WX_CONFIG%% for a non-unicode build (default)
88
 
89
 Environment Variables you can pass:
90
 
91
@@ -462,20 +462,20 @@
92
 then
93
  # many thanks to David Cecchin for finding the unicode issues fixed below.
94
 
95
- WXCONFIGFLAGS=`wx-config  --cppflags $WITHUNICODE `
96
+ WXCONFIGFLAGS=`%%WX_CONFIG%%  --cppflags $WITHUNICODE `
97
  if [ -z "$WXCONFIGFLAGS" ]
98
  then
99
-    echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
100
-    which wx-config
101
+    echo %%WX_CONFIG%% has failed, or returned an error.  Ensure that it exists in your path.
102
+    which %%WX_CONFIG%%
103
     exit 3
104
  fi
105
- CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
106
- CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
107
- LINKOPTS="`wx-config $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
108
+ CFLAGS="$CFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS"
109
+ CXXFLAGS="$CXXFLAGS -I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS"
110
+ LINKOPTS="`%%WX_CONFIG%% $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
111
  if [ -z "$LINKOPTS" ]
112
  then
113
-    echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
114
-    which wx-config
115
+    echo %%WX_CONFIG%% has failed, or returned an error.  Ensure that it exists in your path.
116
+    which %%WX_CONFIG%%
117
     exit 3
118
  fi
119
 
120
@@ -840,7 +840,7 @@
121
 #echo $CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem  $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS
122
 if [ -z "$WITHWXUI" ]
123
 then
124
-$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem  $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS $SYSLIBS 2>&1  | head -20
125
+$CXX $GCCSTATIC $WITHTRACE $WITHDEBUG -o ../bin/lisaem  $LIST ../generator/libgenerator.a ../cpu68k/lib68k.a $LINKOPTS 2>&1  | head -20
126
 fi
127
 
128
 if [ -f ../bin/lisaem ]
129
@@ -960,8 +960,8 @@
130
 then
131
 
132
   echo "Freshly compiled `du -sh lisaem`"
133
-  strip lisaem${EXT}
134
-  echo "Stripped `du -sh lisaem`"
135
+# strip lisaem${EXT}
136
+# echo "Stripped `du -sh lisaem`"
137
 
138
   # compress it if upx exists.
139
   if [ -z "$WITHOUTUPX"              ]; then
(-)emulators/lisaem/pkg-plist (+3 lines)
Lines 1-4 Link Here
1
bin/lisadiskinfo
1
bin/lisaem
2
bin/lisaem
3
bin/lisafsh-tool
2
%%DATADIR%%/Info.plist
4
%%DATADIR%%/Info.plist
3
%%DATADIR%%/LisaEm.icns
5
%%DATADIR%%/LisaEm.icns
4
%%DATADIR%%/floppy0.png
6
%%DATADIR%%/floppy0.png
Lines 27-29 Link Here
27
%%DATADIR%%/power_on.png
29
%%DATADIR%%/power_on.png
28
%%DATADIR%%/poweroffclk.wav
30
%%DATADIR%%/poweroffclk.wav
29
share/LisaEm
31
share/LisaEm
32
share/pixmaps/lisaem.png

Return to bug 203246