Bug 84353 - [UPDATE] games/pmars: see 'Description' field
Summary: [UPDATE] games/pmars: see 'Description' field
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: lesi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-07-30 21:00 UTC by Alejandro Pulver
Modified: 2005-07-31 20:36 UTC (History)
0 users

See Also:


Attachments
pmars.diff (7.39 KB, patch)
2005-07-30 21:00 UTC, Alejandro Pulver
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alejandro Pulver 2005-07-30 21:00:16 UTC

* Update to version 0.9.6.
* Add OPTIONS and allow building of different interfaces together.
* Remove documentation (now in games/pmars-doc).
* Remove pkg-plist.
* Format pkg-descr.
Comment 1 lesi freebsd_committer freebsd_triage 2005-07-30 21:07:45 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lesi

Grab.
Comment 2 Gianmarco Giovannelli 2005-07-31 00:07:50 UTC
I think this port should be committed.
Comment 3 Alejandro Pulver 2005-07-31 14:28:51 UTC
>Submitter-Id:	current-users 
>Originator:	Alejandro Pulver 
>Organization:	 
>Confidential:	no 
>Synopsis:	Re: ports/84353: [UPDATE] games/pmars: see 'Description' field 
>Severity:	non-critical 
>Priority:	low 
>Category:	ports 
>Class:		update 
>Release:	FreeBSD 5.4-RELEASE i386 
>Environment:





>Description:


This new diff should fix the cookie problem with changing PKGNAMESUFFIX.


>How-To-Repeat:





>Fix:


--- pmars.diff begins here ---
diff -u pmars/Makefile committed/pmars/Makefile
--- pmars/Makefile	Fri Feb 21 09:05:51 2003
+++ committed/pmars/Makefile	Sun Jul 31 09:56:57 2005
@@ -6,37 +6,106 @@
 #
 
 PORTNAME=	pmars
-PORTVERSION=	0.8
+PORTVERSION=	0.9.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.koth.org/pmars/ \
-		http://www.giovannelli.it/~gmarco/files/
-DISTFILES=	pmars08s.tar.Z
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	corewar
 
-MAINTAINER=	gmarco@giovannelli.it
+MAINTAINER=	alejandro@varnet.biz
 COMMENT=	A portable corewar system with ICWS'94 extensions
 
-USE_XLIB=	yes
-NO_WRKSUBDIR=	yes
-MAKEFILE=	makefile
-ALL_TARGET=	pmars
-MAN6=		pmars.6
+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 \
+		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
+
+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:
-	@${MKDIR} ${PREFIX}/share/games
-	@${MKDIR} ${PREFIX}/share/games/corewars
-	@${INSTALL_PROGRAM} ${WRKSRC}/pmars ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/pmars.6 ${PREFIX}/man/man6
-	@${INSTALL_DATA} ${WRKSRC}/*.red ${PREFIX}/share/games/corewars
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/games/corewars
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can try something like :"
-	@${ECHO_MSG} "pmars -v 603 ${PREFIX}/share/games/corewars/rave.red ${PREFIX}/share/games/corewars/aeka.red"
-	@${ECHO_MSG} "to see how the simulator works (rave.red and aeka.red are two sample warriors)"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Some other warriors are installed in : ${PREFIX}/share/games/corewars"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Plase read also ${PREFIX}/share/games/corewars/README file for more infos"
-	@${ECHO_MSG} "on corewars and on the current version of pmars"
-	@${ECHO_MSG} ""
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
+		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+
+.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
+.endif
+
+.if defined(WITH_ICWS94)
+MAKE_ARGS+=	CFLAGS+="-DEXT94"
+.endif
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+MAKE_ARGS+=	CFLAGS+="-O3 -fomit-frame-pointer"
+.endif
+
+.if defined(WITH_PERMUTATE)
+MAKE_ARGS+=	CFLAGS+="-DPERMUTATE"
+.endif
+
+.if defined(WITH_SMALLMEM)
+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" \
+		LIB+="-lcurses"
+
+.elif defined(WITH_X11)
+PKGNAMESUFFIX=	-x11
+USE_XLIB=	yes
+MAKE_ARGS+=	CFLAGS+="-DXWINGRAPHX" \
+		CFLAGS+="-I${X11BASE}/include" \
+		LIB+="-L${X11BASE}/lib -lX11"
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -u pmars/distinfo committed/pmars/distinfo
--- pmars/distinfo	Wed Mar 31 00:08:01 2004
+++ committed/pmars/distinfo	Sat Jul 30 12:14:39 2005
@@ -1,2 +1,2 @@
-MD5 (pmars08s.tar.Z) = ad1869ea0a388f5c5070c4cd33b09d25
-SIZE (pmars08s.tar.Z) = 226225
+MD5 (pmars-0.9.2.tar.gz) = a73943a34e9de8f0d3028fc4566cd558
+SIZE (pmars-0.9.2.tar.gz) = 158415
Common subdirectories: pmars/files and committed/pmars/files
diff -u pmars/pkg-descr committed/pmars/pkg-descr
--- pmars/pkg-descr	Fri Sep 17 16:16:25 1999
+++ committed/pmars/pkg-descr	Sat Jul 30 16:46:49 2005
@@ -1,9 +1,12 @@
-pMARS (portable Memory Array Redcode Simulator) is a corewar 
-interpreter with multi-platform support.
-pMARS implements the  ICWS'94 draft  standard, but can also be
-used in ICWS'88 mode.
-The base system includes a graphical core display for UNIX (curses, 
-X11 and Linux svgalib), PC/DOS, and the Mac.
+pMARS (portable Memory Array Redcode Simulator) is a corewar interpreter with
+multi-platform support.
+
+pMARS implements the ICWS'94 draft standard, but can also be used in ICWS'88
+mode.
+
+The base system includes a graphical core display for UNIX (curses, X11 and
+Linux svgalib), PC/DOS, and the Mac.
+
 A line-oriented debugger is included to help in writing warriors.
 
 Contributors:
@@ -12,9 +15,7 @@
  * Stefan Strack           (stst@vuse.vanderbilt.edu)
  * Mintardjo Wangsawidjaja (wangsawm@kira.csos.orst.edu)
 
-distfile: pmars08s.tar.Z (about 220kb)
-
 WWW: http://www.koth.org/pmars/
 
--Gianmarco
+- Gianmarco
 gmarco@giovannelli.it
Only in pmars: pkg-plist
--- pmars.diff ends here ---
Comment 4 lesi freebsd_committer freebsd_triage 2005-07-31 20:36:04 UTC
State Changed
From-To: open->closed

Committed, thanks!