version 1.6.3

This commit is contained in:
mickey 1998-06-13 06:50:23 +00:00
parent 90618d1e0a
commit dc5807bd1d
6 changed files with 60 additions and 54 deletions

View File

@ -3,19 +3,19 @@
# Date created: May 19 1998
# Whom: Angelos D. Keromytis
#
# $OpenBSD: Makefile,v 1.1.1.1 1998/05/19 23:44:24 angelos Exp $
# $OpenBSD: Makefile,v 1.2 1998/06/13 06:50:23 mickey Exp $
#
DISTNAME= freeciv153
DISTNAME= freeciv-1.6.3
CATEGORIES= games
MASTER_SITES= ftp://ftp.daimi.aau.dk/pub/stud/pjunold/freeciv/
MASTER_SITES= ftp://freeciv.ultraviolet.org/pub/freeciv/
EXTRACT_SUFX= .tar.gz
MAINTAINER= angelos@openbsd.org
LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
WRKSRC= ${WRKDIR}/freeciv
WRKSRC= ${WRKDIR}/freeciv-1.6.3
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes

View File

@ -1 +1 @@
MD5 (freeciv153.tar.gz) = 590f875a30786ad8f8fab1db3dafe8d1
MD5 (freeciv-1.6.3.tar.gz) = 409e7b501929af008332afcd0468ea3d

View File

@ -1,6 +1,24 @@
*** /dev/null Tue May 19 19:34:34 1998
--- civclient.man Tue May 19 19:37:23 1998
*** Imakefile.orig Sun Jan 18 13:11:24 1998
--- Imakefile Sat Jan 31 16:28:17 1998
***************
*** 0 ****
--- 1 ----
*** 61,68 ****
CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB)
SER_LIBS = $(SOCKLIB)
.c.o:
! $(CC) $(CFLAGS) -c $< -o $@
ComplexProgramTarget_1(civclient, $(CLI_LIBS), $(SYSLIBS))
ComplexProgramTarget_2(civserver, $(SER_LIBS), $(SYSLIBS))
--- 61,71 ----
CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB)
SER_LIBS = $(SOCKLIB)
+ PREFIX?= /usr/X11R6
+ FREECIV_DATADIR = $(PREFIX)/share/freeciv
+
.c.o:
! $(CC) -DFREECIV_DATADIR=\"$(FREECIV_DATADIR)\" $(CFLAGS) -c $< -o $@
ComplexProgramTarget_1(civclient, $(CLI_LIBS), $(SYSLIBS))
ComplexProgramTarget_2(civserver, $(SER_LIBS), $(SYSLIBS))

View File

@ -1,41 +1,6 @@
*** Imakefile.orig Sun Mar 8 19:47:28 1998
--- Imakefile Tue May 19 19:40:14 1998
*** /dev/null Tue May 19 19:34:34 1998
--- civclient.man Tue May 19 19:37:23 1998
***************
*** 22,28 ****
XCOMM if your Xpm library/includes are located in a non-standard directory
XCOMM then specify it below - follow the /users/pjunold example below.
XCOMM
! XPM_INCLUDE_DIR=/usr/include/X11
XCOMM XPM_INCLUDE_DIR=/users/pjunold/xpm-3.4i/lib
XCOMM XPM_LIB_DIR=-L/users/pjunold/xpm-3.4i/lib
--- 22,28 ----
XCOMM if your Xpm library/includes are located in a non-standard directory
XCOMM then specify it below - follow the /users/pjunold example below.
XCOMM
! XPM_INCLUDE_DIR=/usr/X11R6/include/X11
XCOMM XPM_INCLUDE_DIR=/users/pjunold/xpm-3.4i/lib
XCOMM XPM_LIB_DIR=-L/users/pjunold/xpm-3.4i/lib
***************
*** 65,72 ****
CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB)
SER_LIBS = $(SOCKLIB)
.c.o:
! $(CC) $(CFLAGS) -c $< -o $@
ComplexProgramTarget_1(civclient, $(CLI_LIBS), $(SYSLIBS))
ComplexProgramTarget_2(civserver, $(SER_LIBS), $(SYSLIBS))
--- 65,75 ----
CLI_LIBS = $(XPM_LIB_DIR) -lXpm XawClientLibs $(SOCKLIB)
SER_LIBS = $(SOCKLIB)
+ PREFIX?= /usr/X11R6
+ FREECIV_DATADIR = $(PREFIX)/lib/X11/freeciv
*** 0 ****
--- 1 ----
+
.c.o:
! $(CC) -DFREECIV_DATADIR=\"$(FREECIV_DATADIR)\" $(CFLAGS) -c $< -o $@
ComplexProgramTarget_1(civclient, $(CLI_LIBS), $(SYSLIBS))
ComplexProgramTarget_2(civserver, $(SER_LIBS), $(SYSLIBS))

View File

@ -1,6 +1,23 @@
*** /dev/null Tue May 19 19:34:34 1998
--- civserver.man Tue May 19 19:37:23 1998
***************
*** 0 ****
--- 1 ----
+
--- client/climisc.c.orig Tue Feb 3 07:23:52 1998
+++ client/climisc.c Fri Feb 6 16:45:34 1998
@@ -27,6 +27,11 @@
#include <mapctrl.h>
#include <map.h>
+#ifndef FREECIV_DATADIR
+#define FREECIV_DATADIR "data"
+#endif
+
+
/***************************************************************************
...
***************************************************************************/
@@ -42,7 +47,7 @@
if(datadir[i] == '/')
datadir[i] = '\0';
} else {
- datadir = "data"; /* correct if not 'data' is the default */
+ datadir = FREECIV_DATADIR; /* correct if not 'data' is the default */
};
};
sprintf(realfile,"%s/%s",datadir,filename);

View File

@ -0,0 +1,6 @@
*** /dev/null Tue May 19 19:34:34 1998
--- civserver.man Tue May 19 19:37:23 1998
***************
*** 0 ****
--- 1 ----
+