From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 23 00:00:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDFD01C9 for ; Sun, 23 Feb 2014 00:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C74AD19E5 for ; Sun, 23 Feb 2014 00:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1N0003c007130 for ; Sun, 23 Feb 2014 00:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1N000J1007126; Sun, 23 Feb 2014 00:00:00 GMT (envelope-from gnats) Resent-Date: Sun, 23 Feb 2014 00:00:00 GMT Resent-Message-Id: <201402230000.s1N000J1007126@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Wills Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FB397D for ; Sat, 22 Feb 2014 23:50:56 +0000 (UTC) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3CE19BB for ; Sat, 22 Feb 2014 23:50:56 +0000 (UTC) Received: from meatwad.mouf.net (cpe-107-015-170-205.nc.res.rr.com [107.15.170.205]) by mouf.net (8.14.5/8.14.5) with ESMTP id s1MNojBx029302 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 22 Feb 2014 23:50:50 GMT (envelope-from swills@meatwad.mouf.net) Received: (from swills@localhost) by meatwad.mouf.net (8.14.7/8.14.5/Submit) id s1MNoboK085429; Sat, 22 Feb 2014 23:50:37 GMT (envelope-from swills) Message-Id: <201402222350.s1MNoboK085429@meatwad.mouf.net> Date: Sat, 22 Feb 2014 23:50:37 GMT From: Steve Wills To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/186966: [PATCH] games/doomlegacy: Add an option to disable IPX support Cc: danfe@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 00:00:01 -0000 >Number: 186966 >Category: ports >Synopsis: [PATCH] games/doomlegacy: Add an option to disable IPX support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 23 00:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 11.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD meatwad.mouf.net 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r260369M: Sat Jan 18 14:51:04 UTC >Description: - Add an option to disable IPX support For those who have removed it from base via WITHOUT_IPX in src.conf Port maintainer (danfe@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.11 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- doomlegacy-1.44.a4.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 345682) +++ Makefile (working copy) @@ -31,8 +31,10 @@ SVN_REV= 999 -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS IPX OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFAULT= IPX +IPX_DESC= Support for IPX networking NO_STAGE= yes .include @@ -42,6 +44,12 @@ MAKE_ENV= USEASM=1 OLD_DEPENDENCIES=1 .endif +.if ${PORT_OPTIONS:MIPX} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile-ipx +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile-noipx +.endif + post-patch: .SILENT ${REINPLACE_CMD} -e 's| ../dep/$(@F) +- sed --separate -e "s@^[a-zA-Z0-9_]*.o:@\$$(O)/&@" ../dep/$(@F) > sed.dep ++ sed -e "s@^[a-zA-Z0-9_]*.o:@\$$(O)/&@" ../dep/$(@F) > sed.dep + mv sed.dep ../dep/$(@F) + endif + Property changes on: files/extra-patch-Makefile-noipx ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 345682) +++ files/patch-Makefile (working copy) @@ -1,73 +0,0 @@ ---- Makefile.orig -+++ Makefile -@@ -84,7 +84,7 @@ - # std=c89, does not support // commments, no inline, no asm - - # gcc or g++ --CC=gcc -+CC?=gcc - ifdef CC_WATCOM - CC=WATCOMC - endif -@@ -135,9 +135,9 @@ - LIBS := -lopengl32 -lglu32 -lwsock32 -lm - else - # default is Linux, for all unix SDL -- OPTS := -DLINUX -+ OPTS := -DLINUX -DFREEBSD - LDFLAGS=-L/usr/X11R6/lib -- LIBS := -lGL -lGLU -lm -+ LIBS := -lGL -lGLU -lm -lipx - # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have - # the GLU libraries in an X11 directory. - # -lm is needed for pow, powf, and other MATH1 functions. -@@ -392,7 +392,7 @@ - endif - - # compiler and linker flags --CFLAGS = $(WFLAGS) -+#CFLAGS = $(WFLAGS) - - ifdef PROFILEMODE - # build with gprof profiling information -@@ -405,7 +405,7 @@ - else - # build a normal optimized version - #CFLAGS += -O3 -- CFLAGS += $(OPTLEV) -fomit-frame-pointer -+ #CFLAGS += $(OPTLEV) -fomit-frame-pointer - endif - endif - -@@ -583,7 +583,7 @@ - - # executable - $(BIN)/$(EXENAME): $(O) $(OBJS) $(MAINOBJ) versionstring --# @mkdir $(BIN) -+ @mkdir -p $(BIN) - @echo Linking... - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(MAINOBJ) \ - -o $(BIN)/$(EXENAME) $(LIBS) -@@ -651,7 +651,7 @@ - ../dep/main2.dep : i*.c m*.c p*.c - ../dep/main3.dep : q*.c r*.c s*.c t*.c v*.c z*.c - # none: e*.c j*.c k*.c l*.c n*.c o*.c --../dep/hardware.dep : hardware/*.c hardware/*/*.c -+../dep/hardware.dep : hardware/*.c hardware/r_opengl/*.c - # $(INTERFACE).dep : $(INTERFACE)/*.c - ../dep/djgppdos.dep : djgppdos/*.c - ../dep/linux_x.dep : linux_x/*.c linux_x/musserv/*.c linux_x/sndserv/*.c -@@ -673,11 +673,10 @@ - ../dep : - @mkdir ../dep; - --%.dep : -+%.dep : ../dep - @echo "Making dependencies $(@F)" -- if test ! -d ../dep; then mkdir ../dep; fi - $(CC) $(CFLAGS) -MM $^ > ../dep/$(@F) -- sed --separate -e "s@^[a-zA-Z0-9_]*.o:@\$$(O)/&@" ../dep/$(@F) > sed.dep -+ sed -e "s@^[a-zA-Z0-9_]*.o:@\$$(O)/&@" ../dep/$(@F) > sed.dep - mv sed.dep ../dep/$(@F) - endif - --- doomlegacy-1.44.a4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: