Date: Sun, 6 Jan 2013 02:34:15 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175048: games/wmminichess: Fix build with clang Message-ID: <20130106023415.1d07663f18ab7357cd7f772c@yahoo.com> Resent-Message-ID: <201301051810.r05IADPD001790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175048 >Category: ports >Synopsis: games/wmminichess: Fix build with clang >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: Sat Jan 05 18:10:13 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Fix build with clang - Support PLIST_FILES New file: files/patch-chess.c files/patch-xgen.c Remove file: files/patch-aa pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/wmminichess/Makefile games/wmminichess/Makefile --- /usr/ports/games/wmminichess/Makefile 2012-11-08 07:29:53.000000000 +0900 +++ games/wmminichess/Makefile 2013-01-02 02:45:21.000000000 +0900 @@ -1,13 +1,9 @@ -# New ports collection makefile for: (wm)miniCHESS -# Date created: 24 Sep 1999 -# Whom: Will Andrews <andrews@technologist.com> -# +# Created by: Will Andrews <andrews@technologist.com> # $FreeBSD: head/games/wmminichess/Makefile 300896 2012-07-14 13:54:48Z beat $ -# PORTNAME= wmminichess PORTVERSION= 0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ DISTNAME= miniCHESS-${PORTVERSION} @@ -16,14 +12,30 @@ COMMENT= Window Maker chess dockapp game LICENSE= GPLv2 # (or later) -LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess -USE_GMAKE= YES USE_XORG= xpm -MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \ - INSTALL_DATA="${INSTALL_DATA}" + +CPPFLAGS+= -I${LOCALBASE}/include -DENGINE=\"${LOCALBASE}/bin/gnuchessx\" +LDFLAGS+= -L${LOCALBASE}/lib -lXpm -lXext -lX11 + +PORTDOCS= README TODO +PLIST_FILES= bin/minichess + +.include <bsd.port.options.mk> + +do-build: + (cd ${WRKSRC} \ + && ${CC} ${CFLAGS} ${CPPFLAGS} -o minichess *.c ${LDFLAGS}) + +do-install: + (cd ${WRKSRC} && ${INSTALL_PROGRAM} minichess ${PREFIX}/bin) +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} +.for i in ${PORTDOCS} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) +.endfor +.endif .include <bsd.port.mk> diff -urN /usr/ports/games/wmminichess/files/patch-aa games/wmminichess/files/patch-aa --- /usr/ports/games/wmminichess/files/patch-aa 2012-11-08 07:29:53.000000000 +0900 +++ games/wmminichess/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -1,60 +0,0 @@ ---- Makefile.orig Wed Jul 28 21:59:39 1999 -+++ Makefile Wed Sep 29 20:13:10 1999 -@@ -20,34 +20,43 @@ - # (See COPYING / GPL-2.0) - # - -+# PREFIX on FreeBSD -+PREFIX ?= /usr/X11R6 -+LOCAL = ${LOCALBASE} -+ -+# Other stuff. -+SHARE_DIR = $(PREFIX)/share/wmminichess -+#INSTALL_DATA = install -c -o root -g wheel -m 644 -+#INSTALL_PROGRAM = install -c -s -o root -g wheel -m 755 - - # Specify the location of gnuchessx on your system. --GNUCHESS = /usr/local/bin/gnuchessx -+GNUCHESS = $(LOCAL)/bin/gnuchessx - - # Where do you want the binary installed? --DESTDIR = /usr/local/bin -+DESTDIR = $(PREFIX)/bin - - # What do you want to name the binary? - BIN_NAME = minichess - --# Uncomment this line if your using Solaris. --#SOLARIS_LIBS = -lsocket -- --CFLAGS = -ansi -I/usr/X11R6/include --LIBDIR = -L/usr/X11R6/lib --LIBS = -lXpm -lXext -lX11 $(SOLARIS_LIBS) -+CFLAGS += -I$(PREFIX)/include -+LIBDIR = -L$(PREFIX)/lib -+LIBS = -lXpm -lXext -lX11 - OBJS = chess.o xgen.o - - .c.o: -- gcc $(CFLAGS) -DENGINE=\"$(GNUCHESS)\" -c $< -o $*.o -+ ${CC} $(CFLAGS) -DENGINE=\"$(GNUCHESS)\" -c $< -o $*.o -+ -+all: $(BIN_NAME) - - $(BIN_NAME): $(OBJS) -- gcc $(CFLAGS) -o $(BIN_NAME) $(OBJS) $(LIBDIR) $(LIBS) -+ ${CC} $(CFLAGS) -o $(BIN_NAME) $(OBJS) $(LIBDIR) $(LIBS) - - clean: - rm -f $(OBJS) $(BIN_NAME) - --install: -- cp -f $(BIN_NAME) $(DESTDIR) -- chmod 755 $(DESTDIR)/$(BIN_NAME) -- -+install: $(BIN_NAME) -+ $(MKDIR) $(SHARE_DIR) -+ $(INSTALL_PROGRAM) $(BIN_NAME) $(DESTDIR) -+ $(INSTALL_DATA) README $(SHARE_DIR) -+ $(INSTALL_DATA) TODO $(SHARE_DIR) -+ $(INSTALL_DATA) COPYING $(SHARE_DIR) diff -urN /usr/ports/games/wmminichess/files/patch-chess.c games/wmminichess/files/patch-chess.c --- /usr/ports/games/wmminichess/files/patch-chess.c 1970-01-01 09:00:00.000000000 +0900 +++ games/wmminichess/files/patch-chess.c 2012-10-24 03:06:32.000000000 +0900 @@ -0,0 +1,11 @@ +--- chess.c.bak 1999-09-14 02:15:50.000000000 +0900 ++++ chess.c 2012-10-24 03:04:11.000000000 +0900 +@@ -1972,7 +1972,7 @@ + * + * RETURNS: N/A + */ +-void main(int argc, char* argv[]) ++int main(int argc, char* argv[]) + { + int toChild[2]; + int fromChild[2]; diff -urN /usr/ports/games/wmminichess/files/patch-xgen.c games/wmminichess/files/patch-xgen.c --- /usr/ports/games/wmminichess/files/patch-xgen.c 1970-01-01 09:00:00.000000000 +0900 +++ games/wmminichess/files/patch-xgen.c 2012-10-24 03:06:48.000000000 +0900 @@ -0,0 +1,10 @@ +--- xgen.c.orig 1999-07-29 14:00:50.000000000 +0900 ++++ xgen.c 2012-10-24 03:05:24.000000000 +0900 +@@ -30,6 +30,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <X11/Xlib.h> + #include <X11/xpm.h> diff -urN /usr/ports/games/wmminichess/pkg-plist games/wmminichess/pkg-plist --- /usr/ports/games/wmminichess/pkg-plist 2012-11-08 07:29:53.000000000 +0900 +++ games/wmminichess/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,5 +0,0 @@ -bin/minichess -share/wmminichess/README -share/wmminichess/COPYING -share/wmminichess/TODO -@dirrm share/wmminichess >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130106023415.1d07663f18ab7357cd7f772c>