Attachment 70263 Details for Bug 102558 – file.diff

[patch] file.diff

file.diff (text/plain), 4.86 KB, created by RuanWei on 2006-08-27 08:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: RuanWei

Created: 2006-08-27 08:30:16 UTC

Size: 4.86 KB

patch

obsolete

>diff -urN skyeyeorig/Makefile skyeye/Makefile
>--- skyeyeorig/Makefile	Sun Aug 27 14:50:18 2006
>+++ skyeye/Makefile	Sun Aug 27 15:24:26 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	skyeye
>-DISTVERSION=	1.2.0-RC4
>+DISTVERSION=	1.2-RC8
> CATEGORIES=	emulators
> MASTER_SITES=	http://download.gro.clinux.org/skyeye/
> 
>@@ -21,13 +21,13 @@
> USE_GMAKE=	yes
> USE_BZIP2=	yes
> USE_GNOME=	gtk20
>-WRKSRC=		${WRKDIR}/${PORTNAME}-1.2.0
>+WRKSRC=		${WRKDIR}/${PORTNAME}-v1
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} != "i386"
>-BROKEN=		Does not compile on !i386
>-.endif
>+#.if ${ARCH} != "i386"
>+#BROKEN=		Does not compile on !i386
>+#.endif
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/binary/skyeye ${PREFIX}/bin
>diff -urN skyeyeorig/distinfo skyeye/distinfo
>--- skyeyeorig/distinfo	Sun Aug 27 14:50:18 2006
>+++ skyeye/distinfo	Sun Aug 27 10:27:08 2006
>@@ -1,3 +1,2 @@
>-MD5 (skyeye-1.2.0-RC4.tar.bz2) = 753ce8a85ff981a4a6718ddf57192275
>-SHA256 (skyeye-1.2.0-RC4.tar.bz2) = 85fe73c12cd0eb7129a837a72486bf0d4791919861d34294da2081ca647d926f
>-SIZE (skyeye-1.2.0-RC4.tar.bz2) = 347420
>+MD5 (skyeye-1.2-RC8.tar.bz2) = f489f73bb8bc529d36b69d6a6024adc4
>+SIZE (skyeye-1.2-RC8.tar.bz2) = 402478
>diff -urN skyeyeorig/files/patch-Makefile skyeye/files/patch-Makefile
>--- skyeyeorig/files/patch-Makefile	Sun Aug 27 14:50:18 2006
>+++ skyeye/files/patch-Makefile	Sun Aug 27 15:00:44 2006
>@@ -1,17 +1,20 @@
>---- Makefile.orig	Mon Dec  5 09:52:42 2005
>-+++ Makefile	Fri Jan 20 01:44:58 2006
>-@@ -53,8 +53,8 @@
>- ARCH_COLDFIRE_CFLAGS = -I arch/coldfire/common
>+--- Makefile.orig	Sat Aug  5 02:33:20 2006
>++++ Makefile	Sun Aug 27 15:00:42 2006
>+@@ -56,11 +56,11 @@
>  DEVICE_CFLAGS = -I device/ -I device/net -I device/lcd -I device/flash
>- UTILS_CFLAGS = -I utils/share -I utils/main -I utils/config
>--SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) 
>+ UTILS_CFLAGS = -I utils/share -I utils/main -I utils/config -I utils/debugger
>+ SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) 
> -SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs`
>-+SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) `pkg-config gtk+-2.0 --cflags` -I${LOCALBASE}/include
>-+SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` -L${LOCALBASE}/lib
>- #CFLAGS = -g  -DSTANDALONE -DDEFAULT_INLINE=0  -DMODET $(SIM_EXTRA_CFLAGS) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
>- CFLAGS = -g -O2 -DSTANDALONE -DDEFAULT_INLINE=0  -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
>++SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` -L$(LOCALBASE)/lib
>+ #for debug
>+ #CFLAGS = -g    -DSTANDALONE -DDEFAULT_INLINE=0  -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
>+ #for speed
>+-CFLAGS = -g -O2 -DSTANDALONE -DDEFAULT_INLINE=0  -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
>++CFLAGS = -g -O2 -fno-strict-aliasing -DSTANDALONE -DDEFAULT_INLINE=0  -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I$(LOCALBASE)/include 
>  
>-@@ -157,7 +157,7 @@
>+ ARM_COMMON_PATH= arch/arm/common
>+ ARM_DBCT_PATH= arch/arm/dbct
>+@@ -161,7 +161,7 @@
>  	rm -f binary/*.o
>  	rm -f binary/*.a
>  	rm -f binary/skyeye
>@@ -20,7 +23,7 @@
>  
>  distclean mostlyclean maintainer-clean realclean: clean
>  	rm -f TAGS tags
>-@@ -189,7 +189,7 @@
>+@@ -193,7 +193,7 @@
>  CF_COMMON_PATH = arch/coldfire/common/
>  COLDFIRE_FLAG = -I arch/coldire/tracer
>  binary/libcoldfire.a:$(SIM_CF_OBJS) 
>diff -urN skyeyeorig/files/patch-arch_coldfire_Makefile skyeye/files/patch-arch_coldfire_Makefile
>--- skyeyeorig/files/patch-arch_coldfire_Makefile	Sun Aug 27 14:50:18 2006
>+++ skyeye/files/patch-arch_coldfire_Makefile	Sun Aug 27 14:27:45 2006
>@@ -1,5 +1,5 @@
>---- arch/coldfire/Makefile.orig	Fri Jan 20 01:06:08 2006
>-+++ arch/coldfire/Makefile	Fri Jan 20 01:06:50 2006
>+--- arch/coldfire/Makefile.orig	Sun Aug 27 14:26:21 2006
>++++ arch/coldfire/Makefile	Sun Aug 27 14:26:47 2006
> @@ -1,9 +1,9 @@
>  all:
> -	make -C i_5206/

Actions: View | Diff

Attachments on bug 102558: 70263