From owner-freebsd-ports Mon Aug 6 1:20:18 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 70A0037B403 for ; Mon, 6 Aug 2001 01:20:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f768K0744391; Mon, 6 Aug 2001 01:20:00 -0700 (PDT) (envelope-from gnats) Received: from cc92687-a.wlgrv1.pa.home.com (cc92687-a.wlgrv1.pa.home.com [24.5.63.190]) by hub.freebsd.org (Postfix) with ESMTP id 0F44237B405 for ; Mon, 6 Aug 2001 01:13:12 -0700 (PDT) (envelope-from root@cc92687-a.wlgrv1.pa.home.com) Received: (from root@localhost) by cc92687-a.wlgrv1.pa.home.com (8.11.5/8.11.5) id f768DBb00913; Mon, 6 Aug 2001 04:13:11 -0400 (EDT) (envelope-from root) Message-Id: <200108060813.f768DBb00913@cc92687-a.wlgrv1.pa.home.com> Date: Mon, 6 Aug 2001 04:13:11 -0400 (EDT) From: pat@databits.net Reply-To: pat@databits.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/29482: Fix port games/battleball Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 29482 >Category: ports >Synopsis: Fix port games/battleball >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 06 01:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Patrick Li >Release: FreeBSD 4.4-PRERELEASE i386 >Organization: N/A >Environment: System: FreeBSD bottlenek 4.4-PRERELEASE FreeBSD 4.4-PRERELEASE #0: Sun Aug 5 00:29:13 EDT 2001 root@bottlenek:/usr/src/sys/compile/BOTTLENEK i386 >Description: - Add NOPORTDOCS support to pkg-plist and use DOCSDIR - Add ${PTHREAD_LIBS} and ${PTHREAD_CFLAGS} to patch-af to unbreak build (Caught by bento) Maintained by ports@FreeBSD.org >How-To-Repeat: N/A >Fix: diff -ruN /usr/ports/games/battleball/Makefile battleball/Makefile --- /usr/ports/games/battleball/Makefile Mon Jan 8 19:06:20 2001 +++ battleball/Makefile Mon Aug 6 00:47:17 2001 @@ -17,15 +17,17 @@ USE_X_PREFIX= yes USE_MESA= yes WRKSRC= ${WRKDIR}/battleball-2.1-src +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin post-install: .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/battleball + @${MKDIR} ${DOCSDIR} .for file in CHANGELOG README - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/battleball + @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff -ruN /usr/ports/games/battleball/files/patch-af battleball/files/patch-af --- /usr/ports/games/battleball/files/patch-af Sun Apr 16 18:03:02 2000 +++ battleball/files/patch-af Mon Aug 6 00:46:20 2001 @@ -1,21 +1,20 @@ ---- Makefile Thu Sep 2 22:25:18 1999 -+++ Makefile.new Sun Apr 16 17:28:19 2000 -@@ -1,17 +1,18 @@ +--- Makefile.orig Thu Sep 2 22:25:18 1999 ++++ Makefile Mon Aug 6 00:46:04 2001 +@@ -1,17 +1,14 @@ -CXX = g++ -+CXX ?= c++ - +- # If you don't have OpenGL or Mesa, you can still compile BattleBall; # just define the symbol NO_OPENGL when compiling, and don't link with # $(GLLIBS) when linking -CXXFLAGS = -O2 -funroll-loops -+CXXFLAGS ?= -O -pipe - #CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL +-#CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL ++CXXFLAGS += ${PTHREAD_CFLAGS} INCS = -Ibsp -Ilib3d -XLIBS = -L/usr/X11R6/lib -lX11 -+X11BASE ?=/usr/X11R6 +-LIBS = -lm $(XLIBS) +XLIBS = -L$(X11BASE)/lib -lX11 - LIBS = -lm $(XLIBS) ++LIBS = -lm $(XLIBS) ${PTHREAD_LIBS} -GLINCS = -I/usr/local/X11/include -GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL diff -ruN /usr/ports/games/battleball/pkg-plist battleball/pkg-plist --- /usr/ports/games/battleball/pkg-plist Fri Apr 30 22:38:12 1999 +++ battleball/pkg-plist Mon Aug 6 00:34:43 2001 @@ -1,4 +1,4 @@ bin/battleball -share/doc/battleball/CHANGELOG -share/doc/battleball/README -@dirrm share/doc/battleball +%%PORTDOCS%%share/doc/battleball/CHANGELOG +%%PORTDOCS%%share/doc/battleball/README +%%PORTDOCS%%@dirrm share/doc/battleball >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message