Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv520/10.4/unstable/main/finkinfo/x11
Modified Files:
xforms.info
Added Files:
xforms.patch
Log Message:
Make sure to link against dependent libs.
Move lib manpage to -dev splitoff.
Link against libs in build dir.
--- NEW FILE: xforms.patch ---
diff -Nurd -x'*~' xforms-1.0.90.orig/gl/Makefile.in xforms-1.0.90/gl/Makefile.in
--- xforms-1.0.90.orig/gl/Makefile.in 2006-08-31 21:35:31.000000000 -0400
+++ xforms-1.0.90/gl/Makefile.in 2006-08-31 21:51:36.000000000 -0400
@@ -109,7 +109,7 @@
lib_LTLIBRARIES = libformsGL.la
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = -version-info 1:0:0 $(X_LIBS) -lGL -lX11
libformsGL_la_SOURCES = \
glcanvas.c \
@@ -121,7 +121,8 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-libformsGL_la_LIBADD =
+libformsGL_la_LIBADD = $(top_builddir)/lib/libforms.la
+libformsGL_la_DEPENDENCIES = $(top_builddir)/lib/libforms.la
am_libformsGL_la_OBJECTS = glcanvas.lo
libformsGL_la_OBJECTS = $(am_libformsGL_la_OBJECTS)
diff -Nurd -x'*~' xforms-1.0.90.orig/image/Makefile.in
xforms-1.0.90/image/Makefile.in
--- xforms-1.0.90.orig/image/Makefile.in 2006-08-31 21:35:31.000000000
-0400
+++ xforms-1.0.90/image/Makefile.in 2006-08-31 22:03:08.000000000 -0400
@@ -109,7 +109,7 @@
lib_LTLIBRARIES = libflimage.la
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = -version-info 1:0:0 $(JPEG_LIB) $(X_LIBS) -lX11
libflimage_la_SOURCES = \
flimage.h \
@@ -156,7 +156,8 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-libflimage_la_LIBADD =
+libflimage_la_LIBADD = $(top_builddir)/lib/libforms.la
+libflimage_la_DEPENDENCIES = $(top_builddir)/lib/libforms.la
am_libflimage_la_OBJECTS = image.lo image_bmp.lo image_combine.lo \
image_convolve.lo image_crop.lo image_disp.lo image_fits.lo \
image_genesis.lo image_gif.lo image_gzip.lo image_io_filter.lo \
diff -Nurd -x'*~' xforms-1.0.90.orig/lib/Makefile.in
xforms-1.0.90/lib/Makefile.in
--- xforms-1.0.90.orig/lib/Makefile.in 2006-08-31 21:35:31.000000000 -0400
+++ xforms-1.0.90/lib/Makefile.in 2006-08-31 21:36:01.000000000 -0400
@@ -116,7 +116,7 @@
lib_LTLIBRARIES = libforms.la
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = -version-info 1:0:0 $(X_LIBS) $(XPM_LIB) -lX11
libforms_la_SOURCES = \
align.c \
Index: xforms.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xforms.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xforms.info 31 Aug 2006 13:33:24 -0000 1.2
+++ xforms.info 1 Sep 2006 02:47:07 -0000 1.3
@@ -1,18 +1,20 @@
Package: xforms
Version: 1.0.90
-Revision: 1
+Revision: 2
Source: http://savannah.nongnu.org/download/%n/%n-%v.tar.gz
Source-MD5: 558b600402430f207e671e2d0d725b6d
Depends: %N-shlibs (= %v-%r), %N-bin
-Replaces: xforms-shlibs (<= 1.0-1)
+Replaces: xforms-shlibs (<= 1.0-1), xforms-bin (<< 1.0.90-2)
BuildDependsOnly: true
-BuildDepends: fink (>= 0.9.9), libjpeg, x11-dev
+BuildDepends: libjpeg, x11-dev
+Patch: %n.patch
+PatchScript: perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/' configure
SetCPPFLAGS: -I/usr/X11R6/include
ConfigureParams: --with-extra-prefix=%p --enable-gl
--mandir='${prefix}/share/man'
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<< 0.99-1)
- Depends: x11
+ Depends: libjpeg-shlibs, x11
Suggests: %N-bin
Files: lib/lib*.*.dylib
Shlibs: <<
@@ -26,7 +28,7 @@
Package: %N-bin
Replaces: %N (<< 0.99-1)
Depends: %N-shlibs (= %v-%r)
- Files: bin share/man
+ Files: bin share/man/man1
DocFiles: COPYING.LIB README NEWS
<<
Description: GUI toolkit based on Xlib
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
