Date: Fri, 10 Nov 2000 06:35:02 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22745: Update port: games/xnibbles Message-ID: <20001110143502.178FE37B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22745 >Category: ports >Synopsis: Update port: games/xnibbles >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: Fri Nov 10 06:40:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Support CXX/CXXFLAGS propelry >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xnibbles/Makefile games/xnibbles/Makefile --- /usr/ports/games/xnibbles/Makefile Thu Aug 3 21:14:03 2000 +++ games/xnibbles/Makefile Wed Nov 8 22:49:58 2000 @@ -9,37 +9,37 @@ PORTVERSION= 1.0.b3 CATEGORIES= games MASTER_SITES= http://www.tjhsst.edu/xnibbles/ -DISTNAME= xnibbles-1.0BETA3 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/BETA/} MAINTAINER= ports@FreeBSD.org -ALL_TARGET= linux -USE_GMAKE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + USE_X_PREFIX= yes USE_XPM= yes -WRKSRC= ${WRKDIR}/xnibbles +USE_GMAKE= yes +MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" +ALL_TARGET= linux MAN6= xnibbles.6 -CFLAGS+= -I ${X11BASE}/include -L ${X11BASE}/lib - do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/xnibbles ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/xnibbles.6 ${PREFIX}/man/man6 + ${INSTALL_PROGRAM} ${WRKSRC}/xnibbles ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xnibbles.6 ${MANPREFIX}/man/man6 @${MKDIR} ${PREFIX}/share/xnibbles/sounds - @${INSTALL_DATA} ${WRKSRC}/sounds/*.ub ${PREFIX}/share/xnibbles/sounds + ${INSTALL_DATA} ${WRKSRC}/sounds/*.ub ${PREFIX}/share/xnibbles/sounds @${MKDIR} ${PREFIX}/share/xnibbles/levels - @if [ -f ${PREFIX}/share/xnibbles/levels/LEVELS ]; then \ - ${RM} ${PREFIX}/share/xnibbles/levels/LEVELS; \ - fi +.if exists(${PREFIX}/share/xnibbles/levels/LEVELS) + @${RM} ${PREFIX}/share/xnibbles/levels/LEVELS +.endif @${TOUCH} ${PREFIX}/share/xnibbles/levels/LEVELS .for file in 001 002 003 004 005 006 007 008 009 010 011 012 @${ECHO} ${PREFIX}/share/xnibbles/levels/level${file}.xnl >> ${PREFIX}/share/xnibbles/levels/LEVELS - @${INSTALL_DATA} ${WRKSRC}/levels/*.xnl ${PREFIX}/share/xnibbles/levels + ${INSTALL_DATA} ${WRKSRC}/levels/*.xnl ${PREFIX}/share/xnibbles/levels .endfor @${MKDIR} ${PREFIX}/share/doc/xnibbles - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xnibbles - @${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/xnibbles - @${INSTALL_DATA} ${WRKSRC}/levels/README ${PREFIX}/share/doc/xnibbles/README.levels + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xnibbles + ${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/xnibbles + ${INSTALL_DATA} ${WRKSRC}/levels/README ${PREFIX}/share/doc/xnibbles/README.levels .include <bsd.port.mk> diff -urN /usr/ports/games/xnibbles/files/patch-aa games/xnibbles/files/patch-aa --- /usr/ports/games/xnibbles/files/patch-aa Wed Jun 23 02:42:56 1999 +++ games/xnibbles/files/patch-aa Wed Nov 8 22:45:53 2000 @@ -1,39 +1,28 @@ ---- Makefile.orig Wed Feb 25 18:14:35 1998 -+++ Makefile Sun Jun 20 19:14:23 1999 -@@ -23,12 +23,14 @@ - # Compiler to use (C++ compiler _please_) - CC = g++ +--- Makefile.orig Thu Feb 26 09:14:35 1998 ++++ Makefile Wed Nov 8 22:45:42 2000 +@@ -25,10 +25,10 @@ -- # Directory for XNibbles specific data -- # This must be set correctly at compile time + # Directory for XNibbles specific data + # This must be set correctly at compile time - DATADIR = /usr/local/games/xnibbles -- ++ DATADIR = ${PREFIX}/share/xnibbles + # Prefix to find bin and man directories for installation -+ifndef PREFIX - PREFIX = /usr/local -+endif -+ -+ # Directory for XNibbles specific data -+ # This must be set correctly at compile time -+ DATADIR = $(PREFIX)/share/xnibbles +- PREFIX = /usr/local ++ PREFIX ?= /usr/local # Install program INSTALL = /usr/bin/install -@@ -40,7 +42,7 @@ - ### LINUX ONLY OPTIONS ### - - # Requires kernel sound support, change from 0 to 1 if you want it -- SOUND = 0 -+ #SOUND = 0 - SOUNDDEV = /dev/dsp +@@ -76,9 +76,9 @@ - # Requires kernel joystick support, change from 0 to 1 if you want it -@@ -77,7 +79,7 @@ linux: $(MAKE) OBJECTS=$(OBJECTS) \ - CC=$(CC) LDFLAGS='-L/usr/X11R6/lib' \ +- CC=$(CC) LDFLAGS='-L/usr/X11R6/lib' \ - CFLAGS='-Wall -O2 $(SDEV) \ -+ CFLAGS+='-Wall $(SDEV) \ - -I/usr/X11R6/include -fwritable-strings \ +- -I/usr/X11R6/include -fwritable-strings \ ++ CC=${CXX} LDFLAGS='-L${X11BASE}/lib' \ ++ CFLAGS='${CXXFLAGS} $(SDEV) \ ++ -I${X11BASE}/include -fwritable-strings \ $(JDEV) -DDATADIR=\"$(DATADIR)\"' \ xnibbles + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001110143502.178FE37B4C5>