Attachment 11794 Details for Bug 23074 – file.diff

[patch] file.diff

file.diff (text/plain), 5.47 KB, created by tkato on 2000-11-24 16:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-11-24 16:30:05 UTC

Size: 5.47 KB

patch

obsolete

>diff -urN /usr/ports/games/frotz/Makefile games/frotz/Makefile
>--- /usr/ports/games/frotz/Makefile	Fri Apr 14 18:49:07 2000
>+++ games/frotz/Makefile	Wed Nov 22 21:29:41 2000
>@@ -5,27 +5,25 @@
> # $FreeBSD: ports/games/frotz/Makefile,v 1.5 2000/04/14 06:42:56 mharo Exp $
> #
> 
>-PORTNAME=		frotz
>-PORTVERSION=		2.32
>-CATEGORIES=		games
>-MASTER_SITES=		ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
>-DISTNAME=		UnixFrotz232R2Std10
>+PORTNAME=	frotz
>+PORTVERSION=	2.40
>+CATEGORIES=	games
>+MASTER_SITES=	http://www.cs.csubak.edu/~dgriffi/frotz/files/ \
>+		ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
> 
>-MAINTAINER=		ports@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> 
>-ALL_TARGET=
>-WRKSRC=			${WRKDIR}/frotz-2.32
>+ALL_TARGET=	# empty
> 
>-MAN6=			frotz.6
>+MAN6=		frotz.6
> 
> do-install:
>-	@ ${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
>-	@ ${INSTALL_MAN} ${WRKSRC}/frotz.6 ${PREFIX}/man/man6
>-
>+	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/frotz.6 ${PREFIX}/man/man6
> .if !defined(NOPORTDOCS)
>-	@ ${MKDIR} ${PREFIX}/share/doc/frotz
>-.for file in Readme.unix Todo
>-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/frotz
>+	@${MKDIR} ${PREFIX}/share/doc/frotz
>+.for file in AUTHORS BUGS ChangeLog HOW_TO_PLAY INSTALL README TODO
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/frotz
> .endfor
> .endif
> 
>diff -urN /usr/ports/games/frotz/distinfo games/frotz/distinfo
>--- /usr/ports/games/frotz/distinfo	Mon May 18 13:10:05 1998
>+++ games/frotz/distinfo	Wed Nov 22 21:04:35 2000
>@@ -1 +1 @@
>-MD5 (UnixFrotz232R2Std10.tar.gz) = 5c40f4a9da46a65cd0fd09821bf93538
>+MD5 (frotz-2.40.tar.gz) = b19fa5528e6a5ea13afeecf8b38cccc3
>diff -urN /usr/ports/games/frotz/files/patch-aa games/frotz/files/patch-aa
>--- /usr/ports/games/frotz/files/patch-aa	Mon Jun  8 07:26:59 1998
>+++ games/frotz/files/patch-aa	Wed Nov 22 21:16:42 2000
>@@ -1,39 +1,61 @@
>---- Makefile.orig	Fri Oct 17 16:11:10 1997
>-+++ Makefile	Sun Jun  7 18:26:02 1998
>-@@ -1,7 +1,7 @@
>- 
>- # Define your c compiler.  I recommend gcc if you've got it.
>- #CC = cc
>+--- Makefile.orig	Sat Nov 11 20:50:16 2000
>++++ Makefile	Wed Nov 22 21:16:35 2000
>+@@ -1,26 +1,26 @@
>+ #Define your C compiler.  I recommend gcc if you have it.
> -CC = gcc
> +#CC = gcc
>+ #CC = cc
>  
>  # Define your optimization flags.  Most compilers understand -O and -O2,
>- # Debugging (don't use)
>-@@ -43,7 +43,8 @@
>- #                     have that option.
>- #
>- #DEFS = -DUSE_GETOPT_H -DCOLOR_SUPPORT -DEMACS_EDITING
>--DEFS =
>-+DEFS = -DCOLOR_SUPPORT -DEMACS_EDITING -DUSE_NCURSES_H -DUSE_NOTHING \
>-+	-DUSE_UNISTD_H
>- 
>- # This should point to the location of your curses or ncurses include file
>- # if it's in a non-standard place.
>-@@ -57,7 +58,7 @@
>- #CURSES = -lncurses
>+ # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.)
>+-OPTS = -O2 
>++#OPTS = -O2 
>+ # Pentium with gcc 2.7.0 or better
>+ #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \
>+ #-malign-jumps=2
>+ 
>+ # Define where you want Frotz to be installed.  Usually this is /usr/local
>+-PREFIX = /usr/local
>++#PREFIX = /usr/local
>+ #PREFIX =
>+ 
>+ # Define where you want Frotz to look for frotz.conf.
>+-CONFIG_DIR = /usr/local/etc
>++CONFIG_DIR = ${PREFIX}/etc
>+ #CONFIG_DIR = /etc
>+ #CONFIG_DIR = /usr/pkg/etc
>+ #CONFIG_DIR =
>+ 
>+ # Uncomment this if you want color support.  Usually this requires ncurses.
>+-#COLOR_DEFS = -DCOLOR_SUPPORT
>++COLOR_DEFS = -DCOLOR_SUPPORT
>+ 
>+ # Uncomment this if you have an OSS soundcard driver and want classical
>+ # Infocom sound support.
>+@@ -28,7 +28,7 @@
>+ 
>+ # This should point to the location of your curses.h or ncurses.h include
>+ # file if your compiler doesn't know about it.
>+-INCL = -I/usr/local/include
>++#INCL = -I/usr/local/include
>+ #INCL = -I/usr/pkg/include
>+ #INCL = -I/usr/freeware/include
>+ #INCL = -I/5usr/include
>+@@ -37,7 +37,7 @@
>+ # This should define the location and name of whatever curses library you're
>+ # linking with.  Usually, this isn't necessary if /etc/ld.so.conf is set
>+ # up correctly.
>+-LIB = -L/usr/local/lib
>++#LIB = -L/usr/local/lib
>+ #LIB = -L/usr/pkg/lib
>+ #LIB = -L/usr/freeware/lib
>  #LIB = -L/5usr/lib
>- LIB =
>--CURSES = -lcurses
>-+CURSES = -lncurses
>- 
>- # Nothing under this line should need to be changed.
>+@@ -81,7 +81,7 @@
>+ COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \
>+ 	$(MEMMOVE_DEF)
>  
>-@@ -66,7 +67,7 @@
>-           text.o ux_init.o ux_input.o ux_pic.o ux_screen.o ux_sample.o \
>-           ux_text.o variable.o
>+-CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
>++CFLAGS += $(OPTS) $(COMP_DEFS) $(INCL)
>  
>--CFLAGS = $(OPTS) $(DEFS) $(INCL)
>-+CFLAGS+= $(DEFS)
>  
>- frotz: $(OBJECTS)
>- 	$(CC) -o frotz $(OBJECTS) $(LIB) $(CURSES)
>+ $(BINNAME): soundcard.h $(OBJECTS)
>diff -urN /usr/ports/games/frotz/pkg-descr games/frotz/pkg-descr
>--- /usr/ports/games/frotz/pkg-descr	Mon May  3 07:14:28 1999
>+++ games/frotz/pkg-descr	Wed Nov 22 21:06:27 2000
>@@ -7,4 +7,4 @@
> of new games available on the Internet. Check the if-archive
> at ftp.gmd.de.
> 
>-WWW: http://www.geocities.com/SiliconValley/Heights/3222/frotz.html
>+WWW: http://www.cs.csubak.edu/~dgriffi/frotz/
>diff -urN /usr/ports/games/frotz/pkg-plist games/frotz/pkg-plist
>--- /usr/ports/games/frotz/pkg-plist	Thu Aug 13 11:23:04 1998
>+++ games/frotz/pkg-plist	Wed Nov 22 21:19:40 2000
>@@ -1,4 +1,9 @@
> bin/frotz
>-share/doc/frotz/Readme.unix
>-share/doc/frotz/Todo
>+share/doc/frotz/AUTHORS
>+share/doc/frotz/BUGS
>+share/doc/frotz/ChangeLog
>+share/doc/frotz/HOW_TO_PLAY
>+share/doc/frotz/INSTALL
>+share/doc/frotz/README
>+share/doc/frotz/TODO
> @dirrm share/doc/frotz

Actions: View | Diff

Attachments on bug 23074: 11794