Attachment 56598 Details for Bug 85456 – generator-cbiere.diff

[patch] generator-cbiere.diff

generator-cbiere.diff (text/plain), 4.67 KB, created by Alejandro Pulver on 2005-08-29 23:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2005-08-29 23:50:11 UTC

Size: 4.67 KB

patch

obsolete

>diff -urN /usr/ports/emulators/generator-cbiere/Makefile generator-cbiere/Makefile
>--- /usr/ports/emulators/generator-cbiere/Makefile	Fri Jul 15 15:50:55 2005
>+++ generator-cbiere/Makefile	Mon Aug 29 19:47:38 2005
>@@ -6,11 +6,13 @@
> #
> 
> PORTNAME=	generator
>-PORTVERSION=	0.35
>+PORTVERSION=	0.35.r1
>+PORTEPOCH=	1
> CATEGORIES=	emulators
>-MASTER_SITES=	http://www.ghostwhitecrab.com/generator/
>+MASTER_SITES=	http://www.ghostwhitecrab.com/generator/ \
>+		http://www.ghostwhitecrab.de/generator/
> PKGNAMESUFFIX=	-cbiere
>-DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
>+DISTNAME=	${PORTNAME}-0.35${PKGNAMESUFFIX}-r1
> 
> MAINTAINER=	alejandro@varnet.biz
> COMMENT=	SEGA Genesis emulator
>@@ -26,12 +28,11 @@
> 		RAZE "Use RAZE z80 emulation (only for i386)" on \
> 		SDL_AUDIO "Use SDL for audio" off
> 
>-GNU_CONFIGURE=		yes
>-CONFIGURE_ARGS=		--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
>-			LDFLAGS="-L${LOCALBASE}/lib"
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/
> CONFIGURE_ARGS+=	--with-gtk
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib"
> 
> PLIST_FILES=	bin/${PORTNAME}${PKGNAMESUFFIX}-gtk
> 
>@@ -43,33 +44,6 @@
> 	@${ECHO_CMD}
> 
> .include <bsd.port.pre.mk>
>-
>-.if ${ARCH} != "amd64" && ${ARCH} != "i386"
>-USE_REINPLACE=	yes
>-
>-post-patch:
>-# These architectures do not support "-minline-all-stringops"
>-	@${REINPLACE_CMD} -e 's|-minline-all-stringops||g' \
>-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-.if ${ARCH} == "alpha"
>-# "-ffast-math" does not work on alpha
>-	@${REINPLACE_CMD} -e 's|-ffast-math||g' \
>-				${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-.endif
>-.endif
>-
>-# Generator needs GCC 2.95.x or GCC >= 3.4.2 to work properly.
>-# Generator-CBiere automatically determines the GCC version.
>-
>-.if ${OSVERSION} < 400012
>-# GCC < 2.95 is in the base system.
>-USE_GCC=		2.95
>-.endif
>-
>-.if ${OSVERSION} >= 500035 && ${OSVERSION} < 502126
>-# GCC > 2.95 (3.X) && GCC < 3.4.2 is in the base system.
>-USE_GCC=		3.4
>-.endif
> 
> .if defined(WITHOUT_OPTIMIZED_CFLAGS)
> CONFIGURE_ARGS+=	--without-gcc
>diff -urN /usr/ports/emulators/generator-cbiere/distinfo generator-cbiere/distinfo
>--- /usr/ports/emulators/generator-cbiere/distinfo	Fri Jun 17 00:02:45 2005
>+++ generator-cbiere/distinfo	Mon Aug 29 15:29:15 2005
>@@ -1,2 +1,2 @@
>-MD5 (generator-0.35-cbiere.tar.bz2) = bce3326c165d74e8a00e50355b653e08
>-SIZE (generator-0.35-cbiere.tar.bz2) = 454740
>+MD5 (generator-0.35-cbiere-r1.tar.bz2) = 94cbc31f778f5ec6cc2979520aae26d6
>+SIZE (generator-0.35-cbiere-r1.tar.bz2) = 445802
>diff -urN /usr/ports/emulators/generator-cbiere/files/patch-configure generator-cbiere/files/patch-configure
>--- /usr/ports/emulators/generator-cbiere/files/patch-configure	Tue Jun 28 05:58:42 2005
>+++ generator-cbiere/files/patch-configure	Wed Dec 31 21:00:00 1969
>@@ -1,10 +0,0 @@
>---- configure.orig     Sun Apr 17 03:19:27 2005
>-+++ configure  Fri Jun 17 20:12:41 2005
>-@@ -4179,7 +4179,6 @@
>-   fi
>-
>-   if [ "x$GCCVER" != "xno" ]; then
>--    CFLAGS="$CFLAGS -W -Wall -Wformat=2"
>-     if [ "x$WARN" != "xno" ]; then
>-       CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused"
>-     fi
>diff -urN /usr/ports/emulators/generator-cbiere/files/patch-hdr_generator.h generator-cbiere/files/patch-hdr_generator.h
>--- /usr/ports/emulators/generator-cbiere/files/patch-hdr_generator.h	Fri Jun 17 00:02:45 2005
>+++ generator-cbiere/files/patch-hdr_generator.h	Sun Aug 28 22:33:42 2005
>@@ -1,6 +1,6 @@
>---- hdr/generator.h.orig	Mon Jan  3 19:07:55 2005
>-+++ hdr/generator.h	Thu Jun 16 22:56:43 2005
>-@@ -257,14 +257,22 @@
>+--- hdr/generator.h.orig	Sun Aug 28 14:44:26 2005
>++++ hdr/generator.h	Sun Aug 28 22:33:12 2005
>+@@ -257,17 +257,26 @@
>  #include "registers.h"
>  #endif
>  
>@@ -9,18 +9,22 @@
> +#endif
> +
>  #if defined(linux)
>-   #include <byteswap.h>
>-   #define SWAP16(x) bswap_16((x))
>-   #define SWAP32(x) bswap_32((x))
>+ 
>+ #include <byteswap.h>
>+ #define SWAP16(x) bswap_16((x))
>+ #define SWAP32(x) bswap_32((x))
>+ 
> -#elif defined(__FreeBSD__)
>-+#elif defined(__FreeBSD__) && __FreeBSD_version >= 500000
>-   #include <sys/endian.h>
>-   #define SWAP16(x) bswap16((x))
>-   #define SWAP32(x) bswap32((x))
>++#elif defined(__FreeBSD__) && __FreeBSD_version >=500000
>+ 
>+ #include <sys/endian.h>
>+ #define SWAP16(x) bswap16((x))
>+ #define SWAP32(x) bswap32((x))
>++
> +#elif defined(__FreeBSD__)
>-+  #include <sys/endian.h>
>-+  #define SWAP16(x) (be16toh(x))
>-+  #define SWAP32(x) (be32toh(x))
>++#include <sys/endian.h>
>++#define SWAP16(x) (be16toh(x))
>++#define SWAP32(x) (be32toh(x))
>+ 
>  #elif defined(__NetBSD__)
>-   #include <sys/bswap.h>
>-   #define SWAP16(x) bswap16((x))
>+

Actions: View | Diff

Attachments on bug 85456: 56598