cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 0.2.1-pre2

Browse Source 
* switches to gtk+2
- fix a deprecation warning
- correctly pickup libreadline (from freebsd)

discussed with aja@
This commit is contained in:
jasper 2010-03-21 09:24:25 +00:00
parent d53afb55c0
commit 770ec4404c
7 changed files with 119 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
games/xscorch/Makefile
View File

@ -1,40 +1,36 @@
# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:43 kili Exp $
# $OpenBSD: Makefile,v 1.4 2010/03/21 09:24:25 jasper Exp $
COMMENT= Scorched Earth-clone
DISTNAME= xscorch-0.2.0
PKGNAME= ${DISTNAME}p1
DISTNAME= xscorch-0.2.1-pre2
CATEGORIES= games
HOMEPAGE= http://www.xscorch.org/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xext Xi c glib gmodule iconv intl m \
pthread-stubs xcb
MASTER_SITES= ${HOMEPAGE}/releases/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
xscorch-0.2.0-64bit.patch.gz \
xscorch-0.2.0-stack-smash.patch.gz
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread-stubs readline sndio termcap xcb z
MODULES= devel/gettext
LIB_DEPENDS= mikmod::audio/libmikmod \
gtk.>=1.2,gdk.>=1.2::x11/gtk+
gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-x \
--with-gtk \
--without-gnome
post-extract:
cd ${WRKSRC} && patch < ${WRKDIR}/xscorch-0.2.0-64bit.patch
cd ${WRKSRC} && patch < ${WRKDIR}/xscorch-0.2.0-stack-smash.patch
find ${WRKDIST} -name \*.orig -print0 | xargs -0 rm
.include <bsd.port.mk>

20
games/xscorch/distinfo
View File

@ -1,15 +1,5 @@
MD5 (xscorch-0.2.0-64bit.patch.gz) = AMa15naDrIViSIVHZZpy8w==
MD5 (xscorch-0.2.0-stack-smash.patch.gz) = Q89iKeDwNMI1gF7IpU5nGA==
MD5 (xscorch-0.2.0.tar.gz) = QoYtveHQ6/h74w9+BEYqZg==
RMD160 (xscorch-0.2.0-64bit.patch.gz) = KX/XmjQXqGqW3r02wNXDuxqax4k=
RMD160 (xscorch-0.2.0-stack-smash.patch.gz) = /93wBXxI/TcumdMWCTsYc10KSyY=
RMD160 (xscorch-0.2.0.tar.gz) = JDqX6q3Wspw1TG4P5nkFXAzbU+I=
SHA1 (xscorch-0.2.0-64bit.patch.gz) = SxCfDbvsDSFpQ+j7lu2fLvTjmrk=
SHA1 (xscorch-0.2.0-stack-smash.patch.gz) = yPou/sx8mfI9McNv4Ld9WkDpxqk=
SHA1 (xscorch-0.2.0.tar.gz) = ttNuK2jobh+CjRMSv3eJr9QIU4Y=
SHA256 (xscorch-0.2.0-64bit.patch.gz) = IMC+xBkHu7Vgqai96pVTwuiXK2zbfkWt5pt60QLkaXA=
SHA256 (xscorch-0.2.0-stack-smash.patch.gz) = qjjNUZG2iHdxjsdyEMEw0y+AyfSjz3cL13Orj7iCSUg=
SHA256 (xscorch-0.2.0.tar.gz) = +R69rz0Ry1aB0bzKdUD6s7AmLNC0N1eFEi/fJpzKxoo=
SIZE (xscorch-0.2.0-64bit.patch.gz) = 3122
SIZE (xscorch-0.2.0-stack-smash.patch.gz) = 727
SIZE (xscorch-0.2.0.tar.gz) = 818449
MD5 (xscorch-0.2.1-pre2.tar.gz) = 8m1MIoBEDJsCNsz42+taXw==
RMD160 (xscorch-0.2.1-pre2.tar.gz) = BRn0lawAY5lqVdGI9rTTZKtY6Ac=
SHA1 (xscorch-0.2.1-pre2.tar.gz) = Wf110XxoiCMP9tA7AQBLmGw6yZQ=
SHA256 (xscorch-0.2.1-pre2.tar.gz) = r7TUUFcCSk0MV6w3ZbrNAGjxZqs4DcV/HOe08X/2A0s=
SIZE (xscorch-0.2.1-pre2.tar.gz) = 824945

39
games/xscorch/patches/patch-Makefile_in
View File

@ -1,18 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/06/06 19:32:25 jasper Exp $
--- Makefile.in.orig Wed Jun 6 17:26:10 2007
+++ Makefile.in Wed Jun 6 17:26:46 2007
@@ -153,12 +153,12 @@ bin_PROGRAMS = $(GTK_PROGRAM) $(NETWORK_PROGRAM)
xscorch_SOURCES = xscorch.c
-xscorch_LDADD = -lm $(GTK_LIBS) $(LIBMIKMOD_LIBS) sgame/libscorch_game.a sgtk/libscorch_gtk.a sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a $(MIKMOD_LD_ADD) $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a libj/jreg/libjreg.a libj/jstr/libjstr.a
+xscorch_LDADD = -lm $(GTK_LIBS) $(LIBMIKMOD_LIBS) sgame/libscorch_game_dup.a sgtk/libscorch_gtk.a sgtk/swidgets/libscorch_widget_gtk.a sai/libscorch_ai.a $(MIKMOD_LD_ADD) $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a libj/jreg/libjreg.a libj/jstr/libjstr.a
xscorch_server_SOURCES = xscorch.c
-xscorch_server_LDADD = -lm $(LIBREADLINE_LIBS) sgame/libscorch_game.a sconsole/libscorch_console.a sai/libscorch_ai.a ssound/libscorch_sound_null.a $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a libj/jreg/libjreg.a libj/jstr/libjstr.a
+xscorch_server_LDADD = -lm $(LIBREADLINE_LIBS) sgame/libscorch_game_dup.a sconsole/libscorch_console.a sai/libscorch_ai.a ssound/libscorch_sound_null.a $(NETWORK_LD_ADD) sutil/libscorch_util.a sgame/libscorch_game.a libj/jreg/libjreg.a libj/jstr/libjstr.a
INCLUDES = -Isgame -Isgtk
$OpenBSD: patch-Makefile_in,v 1.2 2010/03/21 09:24:25 jasper Exp $
--- Makefile.in.orig Mon Feb 1 08:50:38 2010
+++ Makefile.in Mon Feb 1 08:51:26 2010
@@ -289,7 +289,7 @@ xscorch_LDADD = \
-lm \
$(GTK_LIBS) \
$(LIBMIKMOD_LIBS) \
- sgame/libscorch_game.a \
+ sgame/libscorch_game_dup.a \
sgtk/libscorch_gtk.a \
sgtk/swidgets/libscorch_widget_gtk.a \
sai/libscorch_ai.a \
@@ -306,7 +306,7 @@ xscorch_server_SOURCES = \
xscorch_server_LDADD = \
-lm \
$(LIBREADLINE_LIBS) \
- sgame/libscorch_game.a \
+ sgame/libscorch_game_dup.a \
sconsole/libscorch_console.a \
sai/libscorch_ai.a \
ssound/libscorch_sound_null.a \

48
games/xscorch/patches/patch-configure Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-configure,v 1.1 2010/03/21 09:24:25 jasper Exp $
Correctly pickup libreadline.
--- configure.orig Mon Feb 1 08:51:33 2010
+++ configure Mon Feb 1 08:52:06 2010
@@ -14664,7 +14664,7 @@ if test "${ac_cv_lib_readline_rl_callback_handler_inst
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $LIBS"
+LIBS="-lreadline -ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15011,7 +15011,7 @@ if test "${ac_cv_lib_readline_rl_callback_handler_inst
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $LIBS"
+LIBS="-lreadline -ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15080,12 +15080,12 @@ fi
{ $as_echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
$as_echo_n "checking whether readline works at runtime... " >&6; }
templibs="$LIBS"
-LIBS="-lreadline "" $LIBS"
+LIBS="-lreadline -ltermcap "" $LIBS"
if test "$cross_compiling" = yes; then
{ $as_echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
$as_echo "unknown: cross-compiling" >&6; }
READLINE="1"
- LIBREADLINE_LIBS="-lreadline"
+ LIBREADLINE_LIBS="-lreadline -ltermcap"
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -15155,7 +15155,7 @@ $as_echo "$ac_try_echo") >&5
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
READLINE="1"
- LIBREADLINE_LIBS="-lreadline"
+ LIBREADLINE_LIBS="-lreadline -ltermcap"
else
$as_echo "$as_me: program exited with status $ac_status" >&5
$as_echo "$as_me: failed program was:" >&5

14
games/xscorch/patches/patch-sgame_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-sgame_Makefile_in,v 1.1.1.1 2007/06/06 19:32:25 jasper Exp $
--- sgame/Makefile.in.orig Wed Jun 6 14:32:03 2007
+++ sgame/Makefile.in Wed Jun 6 14:32:44 2007
@@ -253,6 +253,7 @@ libscorch_game.a: $(libscorch_game_a_OBJECTS) $(libsco
$OpenBSD: patch-sgame_Makefile_in,v 1.2 2010/03/21 09:24:25 jasper Exp $
--- sgame/Makefile.in.orig Mon Jun 1 00:20:42 2009
+++ sgame/Makefile.in Mon Feb 1 08:52:18 2010
@@ -342,6 +342,7 @@ libscorch_game.a: $(libscorch_game_a_OBJECTS) $(libsco
-rm -f libscorch_game.a
$(AR) cru libscorch_game.a $(libscorch_game_a_OBJECTS) $(libscorch_game_a_LIBADD)
$(libscorch_game_a_AR) libscorch_game.a $(libscorch_game_a_OBJECTS) $(libscorch_game_a_LIBADD)
$(RANLIB) libscorch_game.a
+ -ln -s libscorch_game.a libscorch_game_dup.a
tags: TAGS
mostlyclean-compile:
-rm -f *.$(OBJEXT)

23
games/xscorch/patches/patch-sgtk_swidgets_slinkspin_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-sgtk_swidgets_slinkspin_c,v 1.1 2010/03/21 09:24:25 jasper Exp $
--- sgtk/swidgets/slinkspin.c.orig Sun Apr 26 19:39:54 2009
+++ sgtk/swidgets/slinkspin.c Mon Feb 1 09:04:43 2010
@@ -126,7 +126,8 @@ GtkWidget *sc_link_spin_new(int *value, int min, int m
spin = g_object_new(sc_link_spin_get_type(), NULL);
g_return_val_if_fail(spin != NULL, NULL);
- spinadjust = (GtkAdjustment *)gtk_adjustment_new(*value, min, max, step, step, step);
+ /* GtkSpinButton: setting an adjustment with non-zero page size is deprecated */
+ spinadjust = (GtkAdjustment *)gtk_adjustment_new(*value, min, max, step, step, 0);
gtk_spin_button_configure(GTK_SPIN_BUTTON(spin), spinadjust, 1, 0);
gtk_widget_set_size_request(GTK_WIDGET(spin), 80, -1);
gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(spin), TRUE);
@@ -222,7 +223,8 @@ GtkWidget *sc_link_spinf_new(double *value, double min
spin = g_object_new(sc_link_spinf_get_type(), NULL);
g_return_val_if_fail(spin != NULL, NULL);
- spinadjust = (GtkAdjustment *)gtk_adjustment_new(*value, min, max, step, step, step);
+ /* GtkSpinButton: setting an adjustment with non-zero page size is deprecated */
+ spinadjust = (GtkAdjustment *)gtk_adjustment_new(*value, min, max, step, step, 0);
gtk_spin_button_configure(GTK_SPIN_BUTTON(spin), spinadjust, 1, 3);
gtk_widget_set_size_request(GTK_WIDGET(spin), 80, -1);
gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(spin), FALSE);

6
games/xscorch/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/06 19:32:25 jasper Exp $
bin/xscorch
bin/xscorch-server
@comment $OpenBSD: PLIST,v 1.2 2010/03/21 09:24:25 jasper Exp $
@bin bin/xscorch
@bin bin/xscorch-server
@man man/man6/xscorch.6
share/xscorch/
share/xscorch/accessories.def