Update of /cvsroot/fink/experimental/alexkhansen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4696
Modified Files:
xcircuit.info xcircuit.patch
Log Message:
Actually seems to build and run!
Index: xcircuit.info
===================================================================
RCS file: /cvsroot/fink/experimental/alexkhansen/xcircuit.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xcircuit.info 1 Dec 2004 15:23:30 -0000 1.1
+++ xcircuit.info 2 Dec 2004 14:55:17 -0000 1.2
@@ -8,9 +8,6 @@
Patch: %n.patch
ConfigureParams: --mandir=%p/share/man
CompileScript: <<
-touch Xw/Makefile.in
-# touch Makefile.in
-# touch Makefile.am
./configure %c
make
<<
@@ -23,9 +20,9 @@
you might want to switch to fullscreen mode when using xcircuit.
<<
DescPackaging: <<
- The upstream source is slightly broken (apparently Xw/Makefile.am was modified
- after Makefile.in was crated, hence automake wants to run). Cheating around
- this by touching Xw/Makefile.in
+Had to add an extra -I/usr/X11R6/include to INCLUDES in Makefile.in to get the
second compiler call to locate the X11
+libraries.
+Needed to add -fno-common to CFLAGS
<<
Maintainer: Max Horn <[EMAIL PROTECTED]>
Homepage: http://xcircuit.ece.jhu.edu/
Index: xcircuit.patch
===================================================================
RCS file: /cvsroot/fink/experimental/alexkhansen/xcircuit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xcircuit.patch 1 Dec 2004 15:23:30 -0000 1.1
+++ xcircuit.patch 2 Dec 2004 14:55:17 -0000 1.2
@@ -1,11 +1,35 @@
---- xcircuit-3.3.0/Makefile.in Wed Dec 1 09:50:58 2004
-+++ ../xcircuit-3.3.0-1.patched/xcircuit-3.3.0/Makefile.in Wed Dec 1
10:01:22 2004
-@@ -66,7 +66,7 @@
- EXEEXT = @EXEEXT@
- EXTRA_LIB_SPECS = @EXTRA_LIB_SPECS@
- GS_EXEC = @GS_EXEC@
--INC_SPECS = @INC_SPECS@
-+INC_SPECS = -I/usr/X11R6/include @INC_SPECS@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
+--- xcircuit-3.3.0/Makefile.in Thu Dec 2 08:55:08 2004
++++ ../xcircuit-3.3.0-1.patched/xcircuit-3.3.0/Makefile.in Thu Dec 2
08:54:42 2004
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.7.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+@@ -51,7 +51,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fno-common
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+@@ -202,7 +202,7 @@
+ xcircuit_DEPEND = @SUBLIB@
+ xcircuit_LDADD = @SUBLIB@ @STDLIBS@
+ man_MANS = xcircuit.1
+-INCLUDES = -IXw ${INC_SPECS}
++INCLUDES = -IXw -I/usr/X11R6/include ${INC_SPECS}
+
+ # Library directory and files
+ librarydir = $(datadir)/$(PACKAGE)-$(VERSION)
+@@ -698,7 +698,7 @@
+
+ maintainer-clean: maintainer-clean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+- -rm -rf autom4te.cache
++ -rm -rf $(top_srcdir)/autom4te.cache
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+
+ mostlyclean: mostlyclean-recursive
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
