Date: Tue, 4 Oct 2005 12:53:20 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/86895: [MAINTAINER UPDATE] games/pmars: allow installing different interfaces at once Message-ID: <1128441200.0@phobos.mars.bsd> Resent-Message-ID: <200510041600.j94G0U6S093753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 86895 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/pmars: allow installing different interfaces at once >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 04 16:00:30 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: Changes: * Allow installing different interfaces at once. * Install documentation, obsoleting "games/pmars-doc" (please remove it). >How-To-Repeat: >Fix: --- pmars.diff begins here --- diff -urN /usr/ports/games/pmars/Makefile pmars/Makefile --- /usr/ports/games/pmars/Makefile Mon Aug 1 21:15:54 2005 +++ pmars/Makefile Tue Oct 4 12:47:48 2005 @@ -2,7 +2,7 @@ # Date created: 15 Feb 1999 # Whom: gmarco@giovannelli.it # -# $FreeBSD: ports/games/pmars/Makefile,v 1.8 2005/07/31 19:33:40 lesi Exp $ +# $FreeBSD: ports/games/pmars/Makefile,v 1.7 2003/02/21 12:05:51 knu Exp $ # PORTNAME= pmars @@ -16,63 +16,23 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src -OPTIONS= SERVER "Use the command-line interface" on \ - CURSES "Use the console (graphical) interface" off \ - X11 "Use the X11 (graphical) interface" off \ +OPTIONS= CURSES "Build the console (graphical) interface" on \ ICWS94 "Enable ICWS'94 support" on \ OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ PERMUTATE "Enable the -P switch" on \ - SMALLMEM "Use 16-bit addresses (smaller)" off + SERVER "Build the command-line interface" on \ + SMALLMEM "Use 16-bit addresses (smaller)" off \ + X11 "Build the X11 (graphical) interface" on MAKE_ARGS+= CFLAGS+="${CFLAGS}" \ CFLAGS+="-fno-builtin" -PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX} - -EXTRACT_COOKIE= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g} -CONFIGURE_COOKIE=${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g} -INSTALL_COOKIE= ${WRKDIR}/.install_done.${PORTNAME}.${PREFIX:S/\//_/g} -BUILD_COOKIE= ${WRKDIR}/.build_done.${PORTNAME}.${PREFIX:S/\//_/g} -PATCH_COOKIE= ${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX:S/\//_/g} -PACKAGE_COOKIE= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g} - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ - ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} +MAN6= pmars.6 .include <bsd.port.pre.mk> -# Interfaces (possibly conflictive options) -INTERFACES= SERVER CURSES X11 - -# Check for conflictive options -.for f in ${INTERFACES} -. if defined(WITH_${f}) -. if defined(INTERFACE_SET) -INTERFACE_DUP= yes -. else -INTERFACE_SET= yes -. endif -. endif -.endfor - -# Add options that conflict to a variable -.if defined(INTERFACE_DUP) -. for f in ${INTERFACES} -. if defined(WITH_${f}) -CONFOPTS+= ${f} -. endif -. endfor -.endif - -# Ask the user to remove conflicting options -.if defined(CONFOPTS) -IGNORE= Conflicting options: ${CONFOPTS} -.endif - -# Use default interface if not set -.if !defined(INTERFACE_SET) -WITH_SERVER= yes +.if !defined(WITH_CURSES) && !defined(WITH_SERVER) && !defined(WITH_X11) +IGNORE= Please select at least one interface .endif .if defined(WITH_ICWS94) @@ -91,21 +51,51 @@ MAKE_ARGS+= CFLAGS+="-DSMALLMEM" .endif -.if defined(WITH_SERVER) -PKGNAMESUFFIX= -server -MAKE_ARGS+= CFLAGS+="-DSERVER" - -.elif defined(WITH_CURSES) -PKGNAMESUFFIX= -curses -MAKE_ARGS+= CFLAGS+="-DGRAPHX" \ +.if defined(WITH_CURSES) +TARGETS+= curses +CURSES_ARGS+= CFLAGS+="-DGRAPHX" \ LIB+="-lcurses" +PLIST_SUB+= CURSES="" +.else +PLIST_SUB+= CURSES="@comment " +.endif -.elif defined(WITH_X11) -PKGNAMESUFFIX= -x11 +.if defined(WITH_SERVER) +TARGETS+= server +SERVER_ARGS+= CFLAGS+="-DSERVER" +PLIST_SUB+= SERVER="" +.else +PLIST_SUB+= SERVER="@comment " +.endif + +.if defined(WITH_X11) USE_XLIB= yes -MAKE_ARGS+= CFLAGS+="-DXWINGRAPHX" \ +TARGETS+= x11 +X11_ARGS+= CFLAGS+="-DXWINGRAPHX" \ CFLAGS+="-I${X11BASE}/include" \ LIB+="-L${X11BASE}/lib -lX11" +PLIST_SUB+= X11="" +.else +PLIST_SUB+= X11="@comment " +.endif + +do-build: +.for f in ${TARGETS} + @(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_ARGS} ${${f:U}_ARGS} \ + ${ALL_TARGET} clean) + @(cd ${BUILD_WRKSRC}; ${MV} ${PORTNAME} ${PORTNAME}-${f}) +.endfor + +do-install: +.for f in ${TARGETS} + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin +.endfor +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +. for f in README config doc warriors + @${CP} -R ${WRKSRC}/../${f} ${DOCSDIR} +. endfor + @${INSTALL_MAN} ${WRKSRC}/../doc/pmars.6 ${PREFIX}/man/man6 .endif .include <bsd.port.post.mk> diff -urN /usr/ports/games/pmars/pkg-descr pmars/pkg-descr --- /usr/ports/games/pmars/pkg-descr Mon Aug 1 21:15:54 2005 +++ pmars/pkg-descr Sat Jul 30 16:46:49 2005 @@ -17,5 +17,5 @@ WWW: http://www.koth.org/pmars/ --Gianmarco +- Gianmarco gmarco@giovannelli.it diff -urN /usr/ports/games/pmars/pkg-plist pmars/pkg-plist --- /usr/ports/games/pmars/pkg-plist Wed Dec 31 21:00:00 1969 +++ pmars/pkg-plist Tue Oct 4 12:44:15 2005 @@ -0,0 +1,26 @@ +%%CURSES%%bin/pmars-curses +%%SERVER%%bin/pmars-server +%%X11%%bin/pmars-x11 +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/config/94x.opt +%%PORTDOCS%%%%DOCSDIR%%/config/icws.opt +%%PORTDOCS%%%%DOCSDIR%%/config/mw.mac +%%PORTDOCS%%%%DOCSDIR%%/config/pmars.mac +%%PORTDOCS%%%%DOCSDIR%%/config/x.opt +%%PORTDOCS%%%%DOCSDIR%%/doc/Makefile +%%PORTDOCS%%%%DOCSDIR%%/doc/corewar-faq.html +%%PORTDOCS%%%%DOCSDIR%%/doc/makedoc.ex +%%PORTDOCS%%%%DOCSDIR%%/doc/pmars.6 +%%PORTDOCS%%%%DOCSDIR%%/doc/primer.94 +%%PORTDOCS%%%%DOCSDIR%%/doc/primer.cdb +%%PORTDOCS%%%%DOCSDIR%%/doc/redcode.ref +%%PORTDOCS%%%%DOCSDIR%%/doc/whatsnew.080 +%%PORTDOCS%%%%DOCSDIR%%/warriors/aeka.red +%%PORTDOCS%%%%DOCSDIR%%/warriors/flashpaper.red +%%PORTDOCS%%%%DOCSDIR%%/warriors/pspace.red +%%PORTDOCS%%%%DOCSDIR%%/warriors/rave.red +%%PORTDOCS%%%%DOCSDIR%%/warriors/validate.red +%%PORTDOCS%%@dirrm %%DOCSDIR%%/warriors +%%PORTDOCS%%@dirrm %%DOCSDIR%%/config +%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- pmars.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1128441200.0>