- simplify the patches a bit so updating would be a bit less painfull

This commit is contained in:
jasper 2010-04-23 18:02:11 +00:00
parent 7ad1c1a65a
commit 04b774872d
10 changed files with 12 additions and 91 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2010/04/23 17:39:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.30 2010/04/23 18:02:11 jasper Exp $
COMMENT= collection of games for the GNOME desktop
@ -52,6 +52,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
REGRESS_IS_INTERACTIVE= x11
FAKE_FLAGS= scoredir=${PREFIX}/share/gnome-games/scores/
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/glchess/src/glchess.in.in \
${WRKSRC}/glchess/src/lib/scene/opengl/png.py \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-glines_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-glines_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- glines/Makefile.in.orig Mon Mar 29 20:02:30 2010
+++ glines/Makefile.in Fri Apr 23 18:45:19 2010
@@ -372,7 +372,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1019,16 +1019,11 @@ install-scorefiles-local:
fi
-for i in ${SCOREFILES} ; do \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gnibbles_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gnibbles_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gnibbles/Makefile.in.orig Mon Mar 29 20:02:31 2010
+++ gnibbles/Makefile.in Fri Apr 23 18:45:19 2010
@@ -378,7 +378,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1249,14 +1249,9 @@ install-data-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-for i in ${SCOREFILES} ; do \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gnobots2_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gnobots2_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gnobots2/Makefile.in.orig Mon Mar 29 20:02:31 2010
+++ gnobots2/Makefile.in Fri Apr 23 18:45:19 2010
@@ -380,7 +380,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1262,15 +1262,12 @@ install-data-local:
fname1=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2.scores; \
fname2=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2-safe.scores; \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gnomine_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gnomine_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gnomine/Makefile.in.orig Mon Mar 29 20:02:32 2010
+++ gnomine/Makefile.in Fri Apr 23 18:46:38 2010
@@ -371,7 +371,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1016,14 +1016,9 @@ install-data-local:
-if [ -f $(DESTDIR)$(scoredir)/gnomine.Biiiig.scores -a ! -f $(DESTDIR)$(scoredir)/gnomine.Large.scores ]; then mv -f $(DESTDIR)$(scoredir)/gnomine.Biiiig.scores $(DESTDIR)$(scoredir)/gnomine.Large.scores ; fi
-for i in ${SCOREFILES} ; do \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gnotravex_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gnotravex_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gnotravex/Makefile.in.orig Mon Mar 29 20:02:32 2010
+++ gnotravex/Makefile.in Fri Apr 23 18:46:38 2010
@@ -371,7 +371,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -983,14 +983,9 @@ install-scorefiles-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-for i in ${SCOREFILES} ; do \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gnotski_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gnotski_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gnotski/Makefile.in.orig Mon Mar 29 20:02:33 2010
+++ gnotski/Makefile.in Fri Apr 23 18:46:38 2010
@@ -372,7 +372,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1007,16 +1007,11 @@ install-scorefiles-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-for i in ${SCOREFILES} ; do \

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-gtali_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-gtali_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- gtali/Makefile.in.orig Mon Mar 29 20:02:33 2010
+++ gtali/Makefile.in Fri Apr 23 18:46:38 2010
@@ -372,7 +372,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1041,16 +1041,9 @@ install-data-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-if test -e $(DESTDIR)$(scoredir)/gtali.scores ; then mv $(DESTDIR)$(scoredir)/gtali.scores $(DESTDIR)$(scoredir)/gtali.Regular.scores ; fi

View File

@ -1,19 +1,10 @@
$OpenBSD: patch-mahjongg_Makefile_in,v 1.6 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-mahjongg_Makefile_in,v 1.7 2010/04/23 18:02:11 jasper Exp $
Install the .scores files into share/ , to @sample them
into /var/games/ later.
--- mahjongg/Makefile.in.orig Mon Mar 29 20:02:34 2010
+++ mahjongg/Makefile.in Fri Apr 23 18:46:38 2010
@@ -374,7 +374,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1094,14 +1094,9 @@ install-scorefiles-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-for i in easy difficult confounding pyramid tictactoe cloud dragon bridges ziggurat; do \

View File

@ -1,15 +1,6 @@
$OpenBSD: patch-quadrapassel_Makefile_in,v 1.1 2010/04/23 17:39:02 ajacoutot Exp $
$OpenBSD: patch-quadrapassel_Makefile_in,v 1.2 2010/04/23 18:02:11 jasper Exp $
--- quadrapassel/Makefile.in.orig Fri Apr 23 19:18:58 2010
+++ quadrapassel/Makefile.in Fri Apr 23 19:20:01 2010
@@ -395,7 +395,7 @@ psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
sbindir = @sbindir@
-scoredir = @scoredir@
+scoredir = ${pkgdatadir}/scores/
scores_group = @scores_group@
scores_user = @scores_user@
setgid = @setgid@
@@ -1168,13 +1168,8 @@ install-data-local:
@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/quadrapassel/$(schema_DATA)
-$(mkinstalldirs) $(DESTDIR)$(scoredir)