Erich.T.Enke@wheaton.edu wrote:
>
>>Number:         10630
>>Category:       pkg
>>Synopsis:       fvwm95 build stops at patch

The real problem is that the fvwm95 package is a _mess_.  Both patch-aa and
patch-ah modify the same file (modules/FvwmAudio/Makefile.in), and in fact
the same line, the line which patch-ah changes, is first changed into the
form in question by patch-aa!!  (See below, the LIBS line...)

(At some point before patch-ah was added, I had locally regenerated patch-aa
with the same changes that patch-ah applied, and I haven't compiled it since
patch-ah was added... That's what caused this specific build failure.)

(Actually, fvwm95 took a _ton_ of local patches to get it to compile properly
with xpkgwedge, and additionally there is a critical NULL-dereference problem
which is mentioned on the fvwm95 site which should be patched...)

It doesn't appear that there's been any development on fvwm95 since early
1998 (2.0.43b) and our version is even older (2.0.43a, late 1996).  The
web page doesn't mention version 2.0.43b!

I looked into upgrading the pkgsrc version to 2.0.43b, but gave up after
being repeatedly unable to get it to build cleanly.

(Just as a side note, the ftp master site also contains a _fvwm98_, also
version 2.0.43b, probably just changed the pixmaps a little...)

The double-patching mentioned above:

$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:03 agc Exp $

*** modules/FvwmAudio/Makefile.in.orig	Tue Sep 10 22:25:33 1996
--- modules/FvwmAudio/Makefile.in	Fri Jun 13 21:41:10 1997
***************
*** 10,15 ****
--- 10,17 ----
  bin_dir=@exec_prefix@/bin
  x_includes=@x_includes@
  x_libraries=@x_libraries@
+ libdir=@libdir@
+ includedir=@includedir@
  fvwm_icons=@fvwm_icons@
  fvwm_rc=@fvwm_rc@
  fvwm_name=@fvwm_name@
***************
*** 24,34 ****
  XEXT_LIBRARY=-lXext
  FVWM_LIBRARY=-l${fvwm_name}
  RPLAY_LIBRARY=-lrplay
! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
  
! EXTRA_DEFINES=-DXPM -DSHAPE
  CC=@CC@
! INCLUDES=-I${top_srcdir}/include ${x_includes}
  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
  MAKEDEPEND=@MAKEDEPEND@
  INSTALL=@INSTALL@
--- 26,36 ----
  XEXT_LIBRARY=-lXext
  FVWM_LIBRARY=-l${fvwm_name}
  RPLAY_LIBRARY=-lrplay
! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
  
! EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
  CC=@CC@
! INCLUDES=-I${top_srcdir}/include ${x_includes} -I${includedir}
  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
  MAKEDEPEND=@MAKEDEPEND@
  INSTALL=@INSTALL@


$NetBSD: patch-ah,v 1.1 2000/01/11 01:08:25 simonb Exp $

--- modules/FvwmAudio/Makefile.in.orig	Tue Jan 11 10:27:14 2000
+++ modules/FvwmAudio/Makefile.in	Tue Jan 11 11:55:19 2000
@@ -26,7 +26,7 @@
 XEXT_LIBRARY=-lXext
 FVWM_LIBRARY=-l${fvwm_name}
 RPLAY_LIBRARY=-lrplay
-LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
+LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} -Wl,-R${libdir} ${RPLAY_LIBRARY}
 
 EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
 CC=@CC@

jdarrow

-- 
John Darrow - Senior Technical Specialist               Office: 630/752-5201
Computing Services, Wheaton College, Wheaton, IL 60187  Fax:    630/752-5968
Alphapage: 6303160707@alphapage.airtouch.com            Pager:  630/316-0707
Email:     John.P.Darrow@wheaton.edu