- update to latest release: 1.11.0

This commit is contained in:
ajacoutot 2008-04-01 09:14:31 +00:00
parent d24fdf83d0
commit 0ef375bca4
11 changed files with 100 additions and 120 deletions

View File

@ -1,40 +1,48 @@
# $OpenBSD: Makefile,v 1.17 2007/09/06 19:15:13 naddy Exp $
# $OpenBSD: Makefile,v 1.18 2008/04/01 09:14:31 ajacoutot Exp $
COMMENT= graphical networked AD&D style game
VERSION= 1.4.0
VERSION= 1.11.0
DISTNAME= crossfire-client-${VERSION}
PKGNAME= ${DISTNAME}p1
CATEGORIES= games x11
IMGDIST= crossfire-client-images-${VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${IMGDIST}${EXTRACT_SUFX}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
crossfire-client-images-${VERSION}${EXTRACT_SUFX}
HOMEPAGE= http://crossfire.real-time.com/
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi c glib gmodule iconv intl m pthread usbhid z
WANTLIB= GL GLU SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xmu Xrandr Xrender atk-1.0 c \
cairo crypto expat fontconfig freetype glib-2.0 glitz \
gmodule-2.0 gobject-2.0 idn m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png pthread ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/}
LIB_DEPENDS= gtk.>=1.2,gdk.>=1.2::x11/gtk+ \
png.>=1::graphics/png \
SDL.>=1::devel/sdl \
SDL_image.>=1::devel/sdl-image
MODULES= devel/gettext
CONFIGURE_ARGS= --disable-gnome
NO_REGRESS= Yes
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
SDL_image.>=2::devel/sdl-image \
glut.>=3::graphics/glut \
curl.>=8::net/curl
USE_X11= Yes
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/utils
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib \
-L${X11BASE}/lib -lm -lXi -lXmu" \
ac_cv_path_SVNVERSION=""
CONFIGURE_ARGS= --enable-gtkv2 \
--disable-gtkv1
IMG= bmaps.client crossfire.base crossfire.clsc
@ -43,5 +51,7 @@ post-install:
.for file in ${IMG}
${INSTALL_DATA} ${WRKDIR}/${file} ${PREFIX}/share/crossfire-client
.endfor
${INSTALL_MAN} ${WRKSRC}/gtk/gcfclient.man \
${PREFIX}/man/man6/gcfclient.6
.include <bsd.port.mk>

View File

@ -1,10 +1,10 @@
MD5 (crossfire-client-1.4.0.tar.gz) = arMQuNLqgOf64kZ3XcgZ4g==
MD5 (crossfire-client-images-1.4.0.tar.gz) = e46ocN5JHPUHDwWuh2vL8g==
RMD160 (crossfire-client-1.4.0.tar.gz) = XBXLbcU1kSUcfGpy7bkMbxuTjk8=
RMD160 (crossfire-client-images-1.4.0.tar.gz) = Ej3haEnIYxJVGqtGdjfszt4Fixw=
SHA1 (crossfire-client-1.4.0.tar.gz) = LZtUhecMTS7SEfnFo25hq1yh2Nc=
SHA1 (crossfire-client-images-1.4.0.tar.gz) = oUY+z+ztDvE67b+5/BsvZBAY6wc=
SHA256 (crossfire-client-1.4.0.tar.gz) = wwjO3bmtW+owmEYQuPfcJNs/kOSQPDt5GrCnGHRcE8Q=
SHA256 (crossfire-client-images-1.4.0.tar.gz) = TQaYrtMh6rNidFSAGygNgxbKEHHpmQcw143K7E6RZ9A=
SIZE (crossfire-client-1.4.0.tar.gz) = 402639
SIZE (crossfire-client-images-1.4.0.tar.gz) = 1335248
MD5 (crossfire-client-1.11.0.tar.gz) = fEcEYGe7C62plR5h0NKYCw==
MD5 (crossfire-client-images-1.11.0.tar.gz) = UWjdd6cTEnSg3FPIKBADBw==
RMD160 (crossfire-client-1.11.0.tar.gz) = n//NMBwPMqWDtfblqdt3x5ANHNc=
RMD160 (crossfire-client-images-1.11.0.tar.gz) = 16pZ1Jx2vB0Wo6M8Nv0NA4zqmCQ=
SHA1 (crossfire-client-1.11.0.tar.gz) = k0YYIH3oVIQcPkZz+JbpeE7nAHM=
SHA1 (crossfire-client-images-1.11.0.tar.gz) = ePJfPa3N+4USGp2f0Nq1NJgLAqc=
SHA256 (crossfire-client-1.11.0.tar.gz) = NzEi266YzWXclQCG2gmPTa/HSbzIQcqOOUM2rqiiNy4=
SHA256 (crossfire-client-images-1.11.0.tar.gz) = QNxq9SavSG+OOLdkWKYIUXzcRXYMOJ60NW2igEqihbo=
SIZE (crossfire-client-1.11.0.tar.gz) = 759887
SIZE (crossfire-client-images-1.11.0.tar.gz) = 2731254

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-common_metaserver_h,v 1.1 2008/04/01 09:14:31 ajacoutot Exp $
--- common/metaserver.h.orig Mon Mar 31 20:58:50 2008
+++ common/metaserver.h Mon Mar 31 20:58:56 2008
@@ -24,6 +24,7 @@
The author can be reached via e-mail to crossfire-devel@real-time.com
*/
+#include <pthread.h>
/* Arbitrary size. At some point, we would need to cut this off simply
* for display/selection reasons.

View File

@ -1,12 +1,29 @@
$OpenBSD: patch-configure,v 1.1 2005/02/12 19:24:22 alek Exp $
$OpenBSD: patch-configure,v 1.2 2008/04/01 09:14:31 ajacoutot Exp $
--- configure.orig Sat Feb 12 19:09:25 2005
+++ configure Sat Feb 12 19:09:27 2005
@@ -7275,7 +7275,7 @@ if test "${ac_cv_lib_SDL_image_IMG_LoadP
@@ -7688,13 +7688,13 @@ fi
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL_image $SDL_CFLAGS $LIBS"
+LIBS="-lSDL_image $SDL_CFLAGS $SDL_LIBS $LIBS"
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* confdefs.h. */
_ACEOF
@@ -7754,7 +7754,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-gnome_Makefile_in,v 1.1.1.1 2002/05/16 00:25:55 mark Exp $
--- gnome/Makefile.in.orig Fri May 3 15:52:09 2002
+++ gnome/Makefile.in Fri May 3 15:53:36 2002
@@ -70,17 +70,17 @@ install:
#install-fix is what can get used when the gnome client actually is
# working
install-fix:
- $(INSTALL) -d ${mandir}
- $(INSTALL) gnome-cfclient.man ${mandir}/gnome-gcfclient.1
- $(INSTALL) -d ${soundlistdir}
- $(INSTALL) gnome-cfclient.soundlist ${soundlistdir}/gnome-cfclient.soundlist
- $(INSTALL) -d ${desktopdir}
- $(INSTALL) gnome-cfclient.desktop ${desktopdir}/gnome-cfclient.desktop
- $(INSTALL) -d ${pixmapsdir}
- $(INSTALL) ../pixmaps/shield.png ${pixmapsdir}/shield.png
- $(INSTALL) ../pixmaps/crossfiretitle.xpm ${pixmapsdir}/crossfiretitle.xpm
- $(INSTALL) -d ${bindir}
- $(INSTALL) gnome-cfclient ${bindir}/gnome-cfclient
+ $(INSTALL) -d $(DESTDIR)$(mandir)
+ $(INSTALL) gnome-cfclient.man $(DESTDIR)$(mandir)/gnome-gcfclient.1
+ $(INSTALL) -d $(DESTDIR)$(soundlistdir)
+ $(INSTALL) gnome-cfclient.soundlist $(DESTDIR)$(soundlistdir)/gnome-cfclient.soundlist
+ $(INSTALL) -d $(DESTDIR)$(desktopdir)
+ $(INSTALL) gnome-cfclient.desktop $(DESTDIR)$(desktopdir)/gnome-cfclient.desktop
+ $(INSTALL) -d $(DESTDIR)$(pixmapsdir)
+ $(INSTALL) ../pixmaps/shield.png $(DESTDIR)$(pixmapsdir)/shield.png
+ $(INSTALL) ../pixmaps/crossfiretitle.xpm $(DESTDIR)$(pixmapsdir)/crossfiretitle.xpm
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) gnome-cfclient $(DESTDIR)$(bindir)/gnome-cfclient
depend:
$(DEPEND) $(DEPENDFLAGS) -- $(CFLAGS) $(GNOME_CFLAGS) $(INCLUDES) -- $(SOURCES)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gtk-v2_src_gtk2proto_h,v 1.1 2008/04/01 09:14:31 ajacoutot Exp $
--- gtk-v2/src/gtk2proto.h.orig Mon Mar 31 20:58:22 2008
+++ gtk-v2/src/gtk2proto.h Mon Mar 31 20:58:26 2008
@@ -110,7 +110,7 @@ extern void menu_quit_character(GtkMenuItem *menuitem,
extern void enable_menu_items(int enable);
/* metaserver.c */
extern gboolean metaserver_selection_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer userdata);
-extern void get_metaserver(void);
+extern char *get_metaserver(void);
extern void on_metaserver_select_clicked(GtkButton *button, gpointer user_data);
extern void on_treeview_metaserver_row_activated(GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
extern void on_metaserver_text_entry_activate(GtkEntry *entry, gpointer user_data);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gtk-v2_src_metaserver_c,v 1.1 2008/04/01 09:14:31 ajacoutot Exp $
--- gtk-v2/src/metaserver.c.orig Mon Mar 31 21:00:33 2008
+++ gtk-v2/src/metaserver.c Mon Mar 31 21:00:40 2008
@@ -60,7 +60,7 @@ gboolean metaserver_selection_func (
return TRUE;
}
-get_metaserver()
+char *get_metaserver(void)
{
static int has_init=0;
GtkTreeIter iter;

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.1.1.1 2002/05/16 00:25:55 mark Exp $
--- gtk/Makefile.in.orig Fri May 3 15:50:55 2002
+++ gtk/Makefile.in Fri May 3 15:51:39 2002
@@ -69,10 +69,10 @@ distclean::
$(RM) -f cfsndserv cfclient gcfclient Makefile
install:
- $(INSTALL) -d ${bindir}
- $(INSTALL) -d ${mandir}
- $(INSTALL) gcfclient ${bindir}/gcfclient
- $(INSTALL) gcfclient.man ${mandir}/gcfclient.1
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) -d $(DESTDIR)$(mandir)
+ $(INSTALL) gcfclient $(DESTDIR)$(bindir)/gcfclient
+ $(INSTALL) gcfclient.man $(DESTDIR)$(mandir)/gcfclient.1
depend:
$(DEPEND) $(DEPENDFLAGS) -- $(CFLAGS) $(SDL_CFLAGS) $(GTK_CFLAGS) $(INCLUDES) -- $(SOURCES)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-sound-src_Makefile_in,v 1.1.1.1 2002/05/16 00:25:55 mark Exp $
--- sound-src/Makefile.in.orig Fri May 3 15:54:22 2002
+++ sound-src/Makefile.in Fri May 3 15:54:43 2002
@@ -71,8 +71,8 @@ distclean::
$(RM) -f Makefile cfsndserv
install:
- $(INSTALL) -d ${bindir}
- $(INSTALL) cfsndserv ${bindir}
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) cfsndserv $(DESTDIR)$(bindir)
depend:
$(DEPEND) $(DEPENDFLAGS) -- $(CFLAGS) $(INCLUDES) -- $(PROTOSOURCES) $(SND_SOURCES) gx11.c

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-x11_Makefile_in,v 1.1.1.1 2002/05/16 00:25:55 mark Exp $
--- x11/Makefile.in.orig Fri May 3 15:45:42 2002
+++ x11/Makefile.in Fri May 3 15:46:57 2002
@@ -59,10 +59,10 @@ distclean::
$(RM) -f cfclient Makefile
install:
- $(INSTALL) -d ${bindir}
- $(INSTALL) -d ${mandir}
- $(INSTALL) cfclient ${bindir}/cfclient
- $(INSTALL) cfclient.man ${mandir}/cfclient.1
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL) -d $(DESTDIR)$(mandir)
+ $(INSTALL) cfclient $(DESTDIR)$(bindir)/cfclient
+ $(INSTALL) cfclient.man $(DESTDIR)$(mandir)/cfclient.1
depend:
$(DEPEND) $(DEPENDFLAGS) -- $(CFLAGS) $(INCLUDES) -- $(SOURCES)

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 00:46:08 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2008/04/01 09:14:31 ajacoutot Exp $
bin/cfclient
bin/cfsndserv
bin/gcfclient
@man man/man1/cfclient.1
@man man/man1/gcfclient.1
bin/gcfclient2
@man man/man6/cfclient.6
@man man/man6/gcfclient.6
share/crossfire-client/
share/crossfire-client/bmaps.client
share/crossfire-client/crossfire.base