Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/games
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4551
Modified Files:
xmahjongg.info xmahjongg.patch
Log Message:
modernize the build process
Index: xmahjongg.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/xmahjongg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xmahjongg.patch 1 Sep 2011 01:17:08 -0000 1.1
+++ xmahjongg.patch 2 Jul 2013 21:06:05 -0000 1.2
@@ -1,21 +1,34 @@
-diff -ru xmahjongg-3.5/Makefile.in xmahjongg-3.5-patched/Makefile.in
---- xmahjongg-3.5/Makefile.in Sun Jul 1 14:15:44 2001
-+++ xmahjongg-3.5-patched/Makefile.in Wed Sep 26 17:02:25 2001
-@@ -513,13 +513,13 @@
- ./giftoc -extern -makename -dir $(srcdir) $(IMAGES) > $@
+diff -Nurd -x'*~' xmahjongg-3.7.orig/configure.in xmahjongg-3.7/configure.in
+--- xmahjongg-3.7.orig/configure.in 2013-07-02 16:22:46.000000000 -0400
++++ xmahjongg-3.7/configure.in 2013-07-02 16:23:05.000000000 -0400
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(src/game.hh)
+-AM_INIT_AUTOMAKE(xmahjongg, 3.7)
++AC_INIT([xmahjongg], [3.7])
++AC_CONFIG_SRCDIR([src/game.hh])
++AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
- install-share:
-- $(mkinstalldirs) $(pkgdatadir)/layouts $(pkgdatadir)/tiles
$(pkgdatadir)/backgrounds
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/layouts
$(DESTDIR)$(pkgdatadir)/tiles $(DESTDIR)$(pkgdatadir)/backgrounds
- for i in $(LAYOUTS); do \
-- $(INSTALL_DATA) $(srcdir)/share/layouts/$$i $(pkgdatadir)/layouts; done
-+ $(INSTALL_DATA) $(srcdir)/share/layouts/$$i
$(DESTDIR)$(pkgdatadir)/layouts; done
- for i in $(TILESETS); do \
-- $(INSTALL_DATA) $(srcdir)/share/tiles/$$i $(pkgdatadir)/tiles; done
-+ $(INSTALL_DATA) $(srcdir)/share/tiles/$$i
$(DESTDIR)$(pkgdatadir)/tiles; done
- for i in $(BACKGROUNDS); do \
-- $(INSTALL_DATA) $(srcdir)/share/backgrounds/$$i
$(pkgdatadir)/backgrounds; done
-+ $(INSTALL_DATA) $(srcdir)/share/backgrounds/$$i
$(DESTDIR)$(pkgdatadir)/backgrounds; done
- install-data-local: install-share
+ AC_PROG_CC
+diff -Nurd -x'*~' xmahjongg-3.7.orig/liblcdf/Makefile.am
xmahjongg-3.7/liblcdf/Makefile.am
+--- xmahjongg-3.7.orig/liblcdf/Makefile.am 2013-07-02 16:22:46.000000000
-0400
++++ xmahjongg-3.7/liblcdf/Makefile.am 2013-07-02 16:35:25.000000000 -0400
+@@ -18,4 +18,4 @@
+ ## liblcdf_a_DEPENDENCIES = @FIXLIBC_O@
+ ## liblcdf_a_LIBADD = @FIXLIBC_O@
+
+-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
+diff -Nurd -x'*~' xmahjongg-3.7.orig/src/Makefile.am
xmahjongg-3.7/src/Makefile.am
+--- xmahjongg-3.7.orig/src/Makefile.am 2013-07-02 16:22:46.000000000 -0400
++++ xmahjongg-3.7/src/Makefile.am 2013-07-02 16:35:49.000000000 -0400
+@@ -30,7 +30,7 @@
+
+ BUILT_SOURCES = images.c
+
+-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include $(X_CFLAGS)
+
+ xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ @X_PRE_LIBS@ -lX11
@X_EXTRA_LIBS@
- uninstall-local:
Index: xmahjongg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/xmahjongg.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmahjongg.info 2 Sep 2011 11:04:34 -0000 1.2
+++ xmahjongg.info 2 Jul 2013 21:06:05 -0000 1.3
@@ -1,23 +1,27 @@
Package: xmahjongg
Version: 3.7
-Revision: 2
+Revision: 3
Maintainer: None <fink-de...@lists.sourceforge.net>
-BuildDepends: x11-dev, xmkmf (>= 1.0.2-3)
+BuildDepends: <<
+ autoconf2.6,
+ automake1.13,
+ fink-package-precedence,
+ x11-dev
+<<
Depends: x11
+GCC: 4.0
Source: http://www.lcdf.org/%n/%n-%v.tar.gz
Source-MD5: 9db5bf1b329b410220b7976cd9b3d374
-#Patch: %n.patch
-ConfigureParams: --mandir='${prefix}/share/man'
+PatchFile: %n.patch
+PatchFile-MD5: 1abe8bde03dc300116b0327a915e4e98
CompileScript: <<
-#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- ./configure %c
- make
+ mv configure.in configure.ac
+ autoreconf -fi
+ %{default_script}
+ fink-package-precedence .
<<
InstallScript: <<
- make install DESTDIR=%d
- mkdir -p %i/share/doc/%n
- tail -n 9 README > %i/share/doc/%n/COPYING
+ make install DESTDIR=%d
<<
DocFiles: NEWS README
Description: X-Windows version of Mah Jongg
@@ -31,11 +35,10 @@
* A count of matches remaining.
<<
DescPackaging: <<
-InstallScript includes 'tail' command to create COPYING file and place it in
-correct directory.
-ConfigureParams places manpages in correct directories.
-Patch adds 'DESTDIR' support for 'install-share' target in Makefile.in file.
Previously maintained by Jeremy Higgs <f...@higgs-family.net>
+
+Goofy -I ordering, but doesn't use any fink headers so not bothering
+to fix (fink-package-precedence protects against it anyway) -- dmacks
<<
Homepage: http://www.lcdf.org/xmahjongg/
License: GPL
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
