Date: Tue, 4 Jan 2011 05:11:32 GMT From: Gleb Sushko <neuroworker@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153670: games/instead fix Message-ID: <201101040511.p045BWGD046243@red.freebsd.org> Resent-Message-ID: <201101040520.p045KARa033974@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153670 >Category: ports >Synopsis: games/instead fix >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 04 05:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Gleb Sushko >Release: >Organization: >Environment: >Description: Fixes build with iconv. >How-To-Repeat: >Fix: diff -ruN old/Makefile instead/Makefile --- old/Makefile 2010-12-27 19:15:19.000000000 +0700 +++ instead/Makefile 2011-01-04 12:05:41.000000000 +0700 @@ -6,6 +6,7 @@ PORTNAME= instead PORTVERSION= 1.3.1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://209.44.102.205/FreeBSD/distfiles/ diff -ruN old/files/patch-configure instead/files/patch-configure --- old/files/patch-configure 2010-12-27 19:15:19.000000000 +0700 +++ instead/files/patch-configure 2011-01-04 12:05:19.000000000 +0700 @@ -1,5 +1,5 @@ ---- configure.sh 2010-10-12 19:06:42.000000000 +0800 -+++ configure.sh 2010-12-24 02:55:29.000000000 +0700 +--- configure.sh.orig 2010-10-12 19:06:42.000000000 +0800 ++++ configure.sh 2011-01-04 12:04:35.000000000 +0700 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -35,7 +35,40 @@ fi -@@ -140,20 +140,20 @@ +@@ -109,30 +109,8 @@ + echo "ok" + rm -f /tmp/sdl-test.c /tmp/sdl-test + +-cat << EOF >/tmp/iconv-test.c +-#include <iconv.h> +-int main(int argc, char **argv) +-{ +- iconv_open("",""); +-} +-EOF +-echo $cc +-echo -n "Checking iconv...(" +-echo -n "$cc /tmp/iconv-test.c -o iconv-test)..." +-if ! $cc /tmp/iconv-test.c -o /tmp/iconv-test; then +- if ! $cc /tmp/iconv-test.c -liconv -o /tmp/iconv-test; then +- echo -n "failed. Build without iconv.". +- else +- CFLAGS="$CFLAGS -D_HAVE_ICONV" +- LDFLAGS="$LDFLAGS -liconv" +- echo "ok, with -liconv" +- fi +-else +- CFLAGS="$CFLAGS -D_HAVE_ICONV" +- echo "ok" +-fi +- +-rm -f /tmp/iconv-test.c /tmp/iconv-test ++#build with iconv ++CFLAGS="$CFLAGS -D_HAVE_ICONV" + + if ! make clean >/dev/null 2>&1; then + echo " * Warning!!! Can not do make clean..." +@@ -140,20 +118,20 @@ echo -n "Generating config.make..." echo "# autamatically generated by configure.sh" >config.make @@ -60,7 +93,7 @@ echo "SUBDIRS=src/zlib" >> config.make echo "ZLIB_CFLAGS=-I../zlib" >> config.make echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make -@@ -169,26 +169,7 @@ +@@ -169,26 +147,7 @@ echo "SDL_CFLAGS=\$(shell sdl-config --cflags)" >> config.make echo "SDL_LFLAGS=\$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image" >> config.make echo "ok" @@ -88,7 +121,7 @@ rm -f Rules.make ln -s Rules.make.system Rules.make -@@ -204,16 +185,12 @@ +@@ -204,16 +163,12 @@ echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make echo "LANGPATH=\$(DATAPATH)/languages" >> config.make >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101040511.p045BWGD046243>