Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15501

Modified Files:
        advancemenu.info advancemenu.patch 
Log Message:
bdep: expat1 (dep on shlibs is inherited), patch Makefiles to honor CPPFLAGS


Index: advancemenu.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/advancemenu.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- advancemenu.info    31 Dec 2009 17:45:16 -0000      1.7
+++ advancemenu.info    22 Feb 2010 19:21:58 -0000      1.8
@@ -1,33 +1,55 @@
 Package: advancemenu
 Version: 2.5.0
-Revision: 1
+Revision: 2
 Description: SDL-based frontend for AdvanceMAME
 License: GPL
 Maintainer: David Fang <fang...@users.sourceforge.net>
-BuildDepends: sdl (>= 1.2.9-1001), sdl-image, sdl-mixer (>= 1.2.6-1012), fink 
(>= 0.24.12-1)
-Depends: sdl-shlibs (>= 1.2.9-1001), sdl-image-shlibs, sdl-mixer-shlibs (>= 
1.2.6-1012), advancemame (>= 0.106.0-1)
+BuildDepends: <<
+  sdl (>= 1.2.9-1001),
+  sdl-image,
+  sdl-mixer (>= 1.2.6-1012),
+  expat1,
+  fink (>= 0.24.12-1)
+<<
+Depends: <<
+  sdl-shlibs (>= 1.2.9-1001),
+  sdl-image-shlibs,
+  sdl-mixer-shlibs (>= 1.2.6-1012),
+  advancemame (>= 0.106.0-1)
+<<
 Source: mirror:sourceforge:advancemame/%n-%v.tar.gz
 Source-MD5: 3df294eaf76dc404fcb628a2267400e9
 PatchFile: %n.patch
-PatchFile-MD5: 8ed84dd25478692c902b95bc46ddc74f
-ConfigureParams: --disable-slang --disable-asm --disable-svgalib --disable-fb 
--disable-oss --disable-alsa --disable-svgawin --disable-freetype 
mandir=%p/share/man docdir=%p/share/doc/%n/
+PatchFile-MD5: fab5fc714b42da90cd2e1d0b9f6ffb2a
+ConfigureParams: <<
+  --disable-slang \
+  --disable-asm \
+  --disable-svgalib \
+  --disable-fb \
+  --disable-oss \
+  --disable-alsa \
+  --disable-svgawin \
+  --disable-freetype \
+  mandir=%p/share/man \
+  docdir=%p/share/doc/%n/
+<<
 CompileScript: <<
-./configure %c
-make DATADIR=%p/share/%n
+  ./configure %c
+  make DATADIR=%p/share/%n
 <<
 InstallScript: <<
-mkdir -p %i/bin
-mkdir -p %i/share/%n/bin
-mkdir -p %i/share/%n/man/man1
-mkdir -p %i/share/doc/advancemenu
-make install DESTDIR=%d DATADIR=%p/share/%n INSTALL_MAN_DIR="/usr/bin/install 
-c -d -o root -g admin -m 755"
-# mv %i/bin/advcfg %i/share/%n/bin
-# mv %i/bin/advv %i/share/%n/bin
-# mv %i/share/man/man1/advcfg.1 %i/share/%n/man/man1
-# mv %i/share/man/man1/advv.1 %i/share/%n/man/man1
-cp -pRP %i/share/doc/advance/* %i/share/doc/advancemenu/
-rm -rf %i/share/doc/advance/
-rm -rf %i/share/advance/
+  mkdir -p %i/bin
+  mkdir -p %i/share/%n/bin
+  mkdir -p %i/share/%n/man/man1
+  mkdir -p %i/share/doc/advancemenu
+  make install DESTDIR=%d DATADIR=%p/share/%n 
INSTALL_MAN_DIR="/usr/bin/install -c -d -o root -g admin -m 755"
+  # mv %i/bin/advcfg %i/share/%n/bin
+  # mv %i/bin/advv %i/share/%n/bin
+  # mv %i/share/man/man1/advcfg.1 %i/share/%n/man/man1
+  # mv %i/share/man/man1/advv.1 %i/share/%n/man/man1
+  cp -pRP %i/share/doc/advance/* %i/share/doc/advancemenu/
+  rm -rf %i/share/doc/advance/
+  rm -rf %i/share/advance/
 <<
 DocFiles: BUILD COPYING HISTORY README RELEASE
 DescPort: <<

Index: advancemenu.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/advancemenu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- advancemenu.patch   31 Dec 2009 17:45:16 -0000      1.2
+++ advancemenu.patch   22 Feb 2010 19:21:58 -0000      1.3
@@ -799,3 +799,24 @@
 +      return 0;
 +}
 +
+--- advancemenu-2.5.0/root.mak 2010-01-12 23:22:30.000000000 -0800
++++ advancemenu-2.5.0-patched/root.mak 2010-01-12 23:23:19.000000000 -0800
+@@ -29,7 +29,7 @@
+ # - CONF_DEFS are the defines from autoconf like HAVE_LIBZ_H...
+ # - CONF_CFLAGS_ARCH are the architecture flags
+ # - CONF_CFLAGS_OPT are the optimization flags
+-CFLAGS = $(CONF_DEFS) $(CONF_CFLAGS_ARCH) $(CONF_CFLAGS_OPT)
++CFLAGS = $(CONF_DEFS) $(CONF_CFLAGS_ARCH) $(CONF_CFLAGS_OPT) $(CONF_CPPFLAGS)
+ LDFLAGS = $(CONF_LDFLAGS)
+ 
+ # Compiling message
+--- advancemenu-2.5.0/Makefile.in      2010-01-12 23:22:23.000000000 -0800
++++ advancemenu-2.5.0-patched/Makefile.in      2010-01-12 23:22:59.000000000 
-0800
+@@ -37,6 +37,7 @@
+ conf_lib_meve...@conf_lib_mevent@
+ conf_lib_mrawinp...@conf_lib_mrawinput@
+ conf_lib_mc...@conf_lib_mcpn@
++conf_cppfla...@cppflags@
+ conf_cflags_ar...@conf_cflags_arch@
+ conf_cflags_o...@conf_cflags_opt@
+ conf_ldfla...@conf_ldflags@


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to