Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4262/libs
Modified Files: slang.info slang2.info Log Message: Revert most of my previous commit (in which I by accident/stupidity commited various local hacks :/) Index: slang2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/slang2.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- slang2.info 22 Oct 2010 22:22:50 -0000 1.4 +++ slang2.info 22 Oct 2010 22:41:26 -0000 1.5 @@ -16,7 +16,7 @@ Package: slang2 Version: 2.2.1 -Revision: 2 +Revision: 1 Maintainer: Max Horn <m...@quendi.de> License: Artistic Homepage: http://www.jedsoft.org/slang/ @@ -24,7 +24,6 @@ # Dependencies: BuildDependsOnly: True BuildDepends: << - x11-dev, libpng3, pcre, libiconv-dev @@ -43,10 +42,10 @@ Source-MD5: 51b7e9c29c6812f304531713e2ebf969 # Compile Phase: -SetCFLAGS: -isystem %p/include -I/usr/X11/include +SetCFLAGS: -isystem %p/include NoSetCFLAGS: true NoSetLDFLAGS: true -SetLDFLAGS: -Wl,-search_paths_first -L../src/elfobjs -L%p/lib -L/usr/X11/lib +SetLDFLAGS: -Wl,-search_paths_first -L../src/elfobjs -L%p/lib ConfigureParams: << --mandir=%p/share/man \ @@ -67,7 +66,6 @@ SplitOff: << Package: %N-shlibs Depends: << - x11, libpng3-shlibs, pcre-shlibs, libiconv @@ -87,11 +85,9 @@ S-Lang also provides a platform-independent interface for screen management, keymaps and low-level terminal I/O. << -DescPackaging: << +DescPort: << CPPFLAGS is ignored, so we use CFLAGS instead. We use env tricks to make sure the include files and libs in the build dir -are used, not any already installed ones. - -To ensure it finds X11, we have to hack CFLAGS and LDFLAGS. +are uesd, not any already installed ones. << Index: slang.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/slang.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- slang.info 22 Oct 2010 22:22:50 -0000 1.7 +++ slang.info 22 Oct 2010 22:41:26 -0000 1.8 @@ -69,6 +69,10 @@ << DescPackaging: << Previous revisions by Jeremy Higgs and Christoph Pfisterer. +<< +DescPort: << +Module loading should work thanks to dlcompat, but the shipped modules +are not built right now. CPPFLAGS is ignored, so we use CFLAGS instead. ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs