- leave datadir alone and override the score file location elsewhere

- add @extra support
--
the problem with datadir noticed by espie@
This commit is contained in:
brad 2003-12-24 04:00:38 +00:00
parent 6f34a01f10
commit 50c7891004
7 changed files with 57 additions and 21 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2003/07/07 12:47:58 brad Exp $
# $OpenBSD: Makefile,v 1.23 2003/12/24 04:00:38 brad Exp $
COMMENT= "game where you deal drugs on the streets of NY"
DISTNAME= dopewars-1.5.7
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dopewars/}
@ -29,8 +29,7 @@ CONFIGURE_ARGS+= --enable-nls \
--disable-esd \
--disable-gui-server \
--disable-plugins \
--disable-sdl \
--datadir="/var/games"
--disable-sdl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,15 +1,27 @@
$OpenBSD: patch-Makefile_in,v 1.2 2002/08/27 02:42:36 brad Exp $
--- Makefile.in.orig Tue Jun 25 13:08:22 2002
+++ Makefile.in Mon Aug 26 21:27:48 2002
@@ -162,7 +162,7 @@ $(ACLOCAL_M4): configure.in acinclude.
OpenBSD: patch-Makefile_in,v 1.2 2002/08/27 02:42:36 brad Exp $
--- Makefile.in.orig 2002-06-25 13:08:22.000000000 -0400
+++ Makefile.in 2003-12-23 22:06:53.000000000 -0500
@@ -162,9 +162,9 @@ $(ACLOCAL_M4): configure.in acinclude.
cd $(srcdir) && $(ACLOCAL)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+ # autoconf bullshit removed.
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
- cd $(srcdir) && $(AUTOCONF)
+ # autoconf bullshit removed.
config.h: stamp-h
@if test ! -f $@; then \
@@ -182,7 +182,7 @@ $(srcdir)/config.h.in: $(srcdir)/stamp-h
$(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
+ # autoconf bullshit removed.
@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
mostlyclean-hdr:
@@ -356,7 +356,7 @@ all-recursive-am: config.h
install-exec-am:
install-exec: install-exec-recursive

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-config_h_in,v 1.1 2003/12/24 04:00:38 brad Exp $
--- config.h.in.orig 2002-06-24 13:49:01.000000000 -0400
+++ config.h.in 2003-12-23 22:32:00.000000000 -0500
@@ -269,9 +269,6 @@
/* Define if dopewars should use TCP/IP networking to connect to servers */
#undef NETWORKING
-/* The directory containing the high score file and docs */
-#undef DATADIR
-
/* The directory containing locale files */
#undef LOCALEDIR

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2002/08/27 02:42:36 brad Exp $
--- doc/Makefile.in.orig Tue Jun 25 13:08:25 2002
+++ doc/Makefile.in Mon Aug 26 19:15:41 2002
$OpenBSD: patch-doc_Makefile_in,v 1.3 2003/12/24 04:00:38 brad Exp $
--- doc/Makefile.in.orig 2002-06-25 13:08:25.000000000 -0400
+++ doc/Makefile.in 2003-12-23 21:50:16.000000000 -0500
@@ -122,7 +122,7 @@ WNDRES = @WNDRES@
localedir = @localedir@
plugindir = @plugindir@
-DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
+DOCPATH = ${DESTDIR}${prefix}/share/doc/${PACKAGE}
+DOCPATH = ${DESTDIR}${datadir}/doc/${PACKAGE}
DOCS = aiplayer.html configfile.html index.html i18n.html server.html \
clientplay.html credits.html example-cfg installation.html \
servercommands.html commandline.html developer.html \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2003/07/07 12:40:14 brad Exp $
--- src/Makefile.in.orig Tue Jun 25 13:08:23 2002
+++ src/Makefile.in Sun Jul 6 22:06:48 2003
$OpenBSD: patch-src_Makefile_in,v 1.2 2003/12/24 04:00:38 brad Exp $
--- src/Makefile.in.orig 2002-06-25 13:08:23.000000000 -0400
+++ src/Makefile.in 2003-12-23 22:46:35.000000000 -0500
@@ -133,7 +133,7 @@ plugindir = @plugindir@
@CURSESPORT_TRUE@CURSESPORTSUBDIR = @CURSESPORT_TRUE@cursesport
@ -10,12 +10,14 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2003/07/07 12:40:14 brad Exp $
dopewars_DEPENDENCIES = @GUILIB@ @CURSESLIB@ @GTKPORTLIB@ @CURSESPORTLIB@ @INTLLIBS@ @WNDRES@ @PLUGOBJS@
bin_PROGRAMS = dopewars
@@ -144,7 +144,7 @@ dopewars_SOURCES = admin.c admin.h AIPla
@@ -144,8 +144,8 @@ dopewars_SOURCES = admin.c admin.h AIPla
serverside.c serverside.h sound.c sound.h \
tstring.c tstring.h winmain.c winmain.h
-INCLUDES = -I../intl -I${srcdir} -I.. @GTK_CFLAGS@
-DEFS = @DEFS@
+INCLUDES = -I../intl -I${srcdir} -I.. @GLIB_CFLAGS@ @GTK_CFLAGS@
DEFS = @DEFS@
+DEFS = @DEFS@ -DDATADIR="\"/var/games\""
PIXDIR = ${DESTDIR}${datadir}/pixmaps
DOPEDIR = ${DESTDIR}${bindir}
DOPEBIN = ${DOPEDIR}/dopewars

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.5 2003/07/07 12:40:14 brad Exp $
# $OpenBSD: DEINSTALL,v 1.6 2003/12/24 04:00:38 brad Exp $
#
# dopewars de-installation
@ -7,7 +7,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
SCORE_FILE=/var/games/dopewars.sco
if [ -f $SCORE_FILE ]; then
if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2003/12/15 17:11:44 naddy Exp $
@comment $OpenBSD: PLIST,v 1.14 2003/12/24 04:00:38 brad Exp $
bin/dopewars
man/man6/dopewars.6
@comment share/doc/dopewars/LICENCE
@ -18,5 +18,15 @@ share/doc/dopewars/server.html
share/doc/dopewars/servercommands.html
share/doc/dopewars/windows.html
share/examples/dopewars/dopewars.cfg
share/locale/de/LC_MESSAGES/dopewars.mo
share/locale/fr/LC_MESSAGES/dopewars.mo
share/locale/nn/LC_MESSAGES/dopewars.mo
share/locale/pl/LC_MESSAGES/dopewars.mo
share/locale/pt_BR/LC_MESSAGES/dopewars.mo
share/pixmaps/dopewars-pill.png
share/pixmaps/dopewars-shot.png
share/pixmaps/dopewars-weed.png
@dirrm share/pixmaps
@dirrm share/examples/dopewars
@dirrm share/doc/dopewars
@extraunexec rm -f /var/games/dopewars.sco