Attachment 122768 Details for Bug 166030 – file.diff

[patch] file.diff

file.diff (text/plain), 6.38 KB, created by tkato432 on 2012-03-13 18:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-03-13 18:10:06 UTC

Size: 6.38 KB

patch

obsolete

>diff -urN /usr/ports/games/scare/Makefile games/scare/Makefile
>--- /usr/ports/games/scare/Makefile	2012-02-28 19:52:51.000000000 +0900
>+++ games/scare/Makefile	2012-03-03 06:03:20.000000000 +0900
>@@ -6,44 +6,65 @@
> #
> 
> PORTNAME=	scare
>-PORTVERSION=	1.3.7
>+PORTVERSION=	1.3.10
> CATEGORIES=	games
>-MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/programming/adrift/
>+MASTER_SITES=	http://ifarchive.flavorplex.com/%SUBDIR%/ \
>+		http://ifarchive.heanet.ie/%SUBDIR%/ \
>+		http://ifarchive.jmac.org/%SUBDIR%/ \
>+		http://ifarchive.plover.net/%SUBDIR%/ \
>+		http://ifarchive.wurb.com/%SUBDIR%/ \
>+		http://www.ifarchive.org/%SUBDIR%/ \
>+		ftp://ftp.ifarchive.org/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	if-archive/programming/adrift
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	ADRIFT-compatible interactive games interpreter
> 
>+LICENSE=	GPLv2
>+
> OPTIONS=	XGLK "Use the xglk graphics library" off
> 
> USE_ZIP=	yes
>+MAKE_JOBS_SAFE=yes
> 
>-.include <bsd.port.pre.mk>
>-
>-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
>+PLIST_FILES=	bin/scare
> 
>-BINFILES=	scare
>+.include <bsd.port.options.mk>
> 
> .if defined(WITH_XGLK)
>-PKGNAMESUFFIX=	-glk
>-
> BUILD_DEPENDS+=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
> RUN_DEPENDS+=	${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
>+ALL_TARGET=	scare glkscare
>+PLIST_FILES+=	bin/glkscare
>+.endif
> 
>-ALL_TARGET=	all glkscare
>-
>-EXTRA_PATCHES=	${FILESDIR}/xglk.patch
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/^CC/s|= |?= | ; \
>+		 /^CFLAGS/s|= -O2|+= | ; \
>+		 /^CFLAGS/s|-fPIC|| ; \
>+		 /^LDLIBS/s|=.*|= -lz| ; \
>+		 /-D__unix/s|^#|| ; \
>+		 s|^sinclude.*|.include "$$(GLKPATH)/Make.$$(GLK)"| ; \
>+		 s| $$(ZOBJECTS)||' ${WRKSRC}/source/Makefile
> 
>-BINFILES+=	glkscare
>+do-configure:
>+	@${MKDIR} ${WRKDIR}/xglk
>+.if defined(WITH_XGLK)
>+	@${LN} -sf ${LOCALBASE}/include/xglk/*.h ${WRKDIR}/xglk
>+	@${LN} -sf ${LOCALBASE}/share/xglk/Make.xglk ${WRKDIR}/xglk
> .else
>-EXTRA_PATCHES=	${FILESDIR}/no-xglk.patch
>+	@${TOUCH} ${WRKDIR}/xglk/Make.xglk
> .endif
> 
>-PLIST_FILES=	${BINFILES:S,^,bin/,}
>-
> do-install:
>-		${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/source/,} ${PREFIX}/bin/
>+	${INSTALL_PROGRAM} ${WRKSRC}/source/scare ${PREFIX}/bin
>+.if defined(WITH_XGLK)
>+	${INSTALL_PROGRAM} ${WRKSRC}/source/glkscare ${PREFIX}/bin
>+.endif
> 
> test:	build
>-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
>+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
>+		${MAKEFILE} ${MAKE_ARGS} check
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/games/scare/distinfo games/scare/distinfo
>--- /usr/ports/games/scare/distinfo	2011-07-04 02:03:58.000000000 +0900
>+++ games/scare/distinfo	2012-03-03 04:49:01.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (scare-1.3.7.zip) = bb4d2ff59304d6674f6e7909bd0e171cb69c151ed859c729f6888aa58a17d4e6
>-SIZE (scare-1.3.7.zip) = 1313534
>+SHA256 (scare-1.3.10.zip) = c11410e8474de23d5c8256fd5f303ecac8882e9c4a0e02ece2ea7fb21561a5be
>+SIZE (scare-1.3.10.zip) = 1338680
>diff -urN /usr/ports/games/scare/files/no-xglk.patch games/scare/files/no-xglk.patch
>--- /usr/ports/games/scare/files/no-xglk.patch	2009-03-19 23:41:07.000000000 +0900
>+++ games/scare/files/no-xglk.patch	1970-01-01 09:00:00.000000000 +0900
>@@ -1,17 +0,0 @@
>-Properly disable the use of the xglk library if the port's XGLK option
>-has been turned off.
>-
>---- source/Makefile.orig
>-+++ source/Makefile
>-@@ -73,8 +73,9 @@
>- # If your make can't handle sinclude or -include, and you're not building
>- # for Glk, comment out the include line.
>- GLKPATH	= $(GLKDIR)/$(GLK)
>--sinclude $(GLKPATH)/Make.$(GLK)
>--GLKLIBS	= -L$(GLKPATH) $(GLKLIB) $(LINKLIBS)
>-+#sinclude $(GLKPATH)/Make.$(GLK)
>-+#GLKLIBS	= -L$(GLKPATH) $(GLKLIB) $(LINKLIBS)
>-+GLKLIBS	=
>- 
>- # Always use the Bourne shell.
>- SHELL	= /bin/sh
>diff -urN /usr/ports/games/scare/files/patch-Makefile games/scare/files/patch-Makefile
>--- /usr/ports/games/scare/files/patch-Makefile	2009-03-19 23:41:07.000000000 +0900
>+++ games/scare/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,46 +0,0 @@
>-Only set the Makefile variables conditionally so that they may be
>-overridden by the FreeBSD port.
>-
>---- source/Makefile.orig
>-+++ source/Makefile
>-@@ -26,18 +26,19 @@
>- #
>- 
>- # GCC compiler and linker flags.
>--CC	= gcc
>--DEBUG	=
>--CEXTRA	=
>--CFLAGS	= -O2 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W   \
>-+CC	?= gcc
>-+DEBUG	?=
>-+CEXTRA	?=
>-+CFLAGS	?= -O2 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W  \
>- 	  -pedantic -Wshadow -Wpointer-arith -Wstrict-prototypes	   \
>- 	  -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls	   \
>- 	  -Wwrite-strings -Wundef -Wbad-function-cast -Waggregate-return   \
>- 	  -Wnested-externs						   \
>--	  $(DEBUG) $(CEXTRA)
>--LDLIBS	=
>--LDEXTRA	=
>--LDFLAGS	= $(DEBUG) $(LDEXTRA)
>-+	  $(DEBUG)
>-+CFLAGS	+= $(CEXTRA)
>-+LDLIBS	?=
>-+LDEXTRA	?=
>-+LDFLAGS	?= $(DEBUG) $(LDEXTRA)
>- 
>- # Generic compiler and linker flags.
>- #CC	= cc
>-@@ -79,9 +80,9 @@
>- SHELL	= /bin/sh
>- 
>- # Miscellaneous tools, overridable by the command line.
>--UNZIP	= unzip
>--RM	= rm
>--TEST	= test
>-+UNZIP	?= unzip
>-+RM	?= rm
>-+TEST	?= test
>- 
>- # SCARE objects and headers.
>- OBJECTS	= sctafpar.o sctaffil.o scprops.o scvars.o scexpr.o scprintf.o	\
>diff -urN /usr/ports/games/scare/files/xglk.patch games/scare/files/xglk.patch
>--- /usr/ports/games/scare/files/xglk.patch	2009-03-19 23:41:07.000000000 +0900
>+++ games/scare/files/xglk.patch	1970-01-01 09:00:00.000000000 +0900
>@@ -1,22 +0,0 @@
>-Properly enable the xglk build if the XGLK port option has been turned on.
>-
>---- source/Makefile.orig
>-+++ source/Makefile
>-@@ -73,7 +73,7 @@
>- # If your make can't handle sinclude or -include, and you're not building
>- # for Glk, comment out the include line.
>- GLKPATH	= $(GLKDIR)/$(GLK)
>--sinclude $(GLKPATH)/Make.$(GLK)
>-+.include "$(LOCALBASE)/share/xglk/Make.$(GLK)"
>- GLKLIBS	= -L$(GLKPATH) $(GLKLIB) $(LINKLIBS)
>- 
>- # Always use the Bourne shell.
>-@@ -134,7 +134,7 @@
>- 
>- os_glk.o: os_glk.c $(HEADERS)
>- 	$(CC) $(GLKARCH) $(CFLAGS) -Wno-write-strings			\
>--		-I $(GLKDIR)/$(GLK) -c -o $@ $<
>-+		-DLINUX_GRAPHICS -I${LOCALBASE}/include/xglk -c -o $@ $<
>- 
>- # Option to build an IFP plugin version of SCARE.
>- scare_plugin.c: scare.hdr
>diff -urN /usr/ports/games/scare/pkg-descr games/scare/pkg-descr
>--- /usr/ports/games/scare/pkg-descr	2011-08-23 18:39:50.000000000 +0900
>+++ games/scare/pkg-descr	2012-03-03 05:49:44.000000000 +0900
>@@ -1 +1,3 @@
> An ADRIFT-compatible interactive games interpreter.
>+
>+WWW: http://sites.google.com/site/scarehome/

Actions: View | Diff

Attachments on bug 166030: 122768