diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2011-01-06 22:42:39 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2011-01-06 22:42:39 +0800 |
| commit | 174c4811656a30e545c8f99b3eb9ad17cbd5209e (patch) | |
| tree | 1bd60c54ec5bb65d748bdcb229e6bc6269bf2b97 | |
| parent | a517a439fc130a81b978db6d9e3f002f4c6f87fe (diff) | |
| download | freebsd-ports-gnome-174c4811656a30e545c8f99b3eb9ad17cbd5209e.tar.gz freebsd-ports-gnome-174c4811656a30e545c8f99b3eb9ad17cbd5209e.tar.zst freebsd-ports-gnome-174c4811656a30e545c8f99b3eb9ad17cbd5209e.zip | |
- Fix build with iconv
PR: 153670
Submitted by: Gleb Sushko <neuroworker@gmail.com> (maintainer)
| -rw-r--r-- | games/instead/Makefile | 2 | ||||
| -rw-r--r-- | games/instead/files/patch-configure | 43 |
2 files changed, 40 insertions, 5 deletions
diff --git a/games/instead/Makefile b/games/instead/Makefile index 343170cf686e..76207cc66667 100644 --- a/games/instead/Makefile +++ b/games/instead/Makefile @@ -6,6 +6,7 @@ PORTNAME= instead PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://209.44.102.205/FreeBSD/distfiles/ @@ -19,6 +20,7 @@ USE_GMAKE= yes USE_GNOME= pkgconfig gtk20 USE_LUA= 5.1 USE_SDL= sdl image ttf mixer +USE_ICONV= yes CONFIGURE_SCRIPT= configure.sh diff --git a/games/instead/files/patch-configure b/games/instead/files/patch-configure index a3a4336e3c50..88982879dba7 100644 --- a/games/instead/files/patch-configure +++ b/games/instead/files/patch-configure @@ -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 |