Subject: pkg/20412: sync xforms buildlink2.mk with reality
To: None <gnats-bugs@gnats.netbsd.org>
From: None <marc@informatik.uni-bremen.de>
List: netbsd-bugs
Date: 02/18/2003 16:59:45
>Number:         20412
>Category:       pkg
>Synopsis:       xforms buildlink2.mk is broken
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Feb 18 08:00:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Marc Recht
>Release:        NetBSD 1.6N
>Organization:
	
>Environment:
	
	
System: NetBSD leeloo.intern.geht.de 1.6N NetBSD 1.6N (LEELOO) #0: Mon Feb 17 11:33:01 CET 2003 root@leeloo.intern.geht.de:/sys/arch/i386/compile/LEELOO i386
Architecture: i386
Machine: i386
>Description:
x11/xforms is broken. It links agains the non-existent libxforms and
forgets about libflimage and it's header..
	
>How-To-Repeat:
	
>Fix:
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xforms/buildlink2.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink2.mk
--- buildlink2.mk       2002/12/28 19:49:07     1.3
+++ buildlink2.mk       2003/02/18 15:55:52
@@ -3,16 +3,19 @@
 .if !defined(XFORMS_BUILDLINK2_MK)
 XFORMS_BUILDLINK2_MK=  # defined
 
-BUILDLINK_PACKAGES+=           xforms
-BUILDLINK_DEPENDS.xforms?=     xforms>=1.0
-BUILDLINK_PKGSRCDIR.xforms?=   ../../x11/xforms
+BUILDLINK_PACKAGES+=                   xforms
+BUILDLINK_DEPENDS.xforms?=             xforms>=1.0
+BUILDLINK_PKGSRCDIR.xforms?=           ../../x11/xforms
 
-EVAL_PREFIX+=                  BUILDLINK_PREFIX.xforms=xforms
+EVAL_PREFIX+=  BUILDLINK_PREFIX.xforms=xforms
 BUILDLINK_PREFIX.xforms_DEFAULT=       ${X11PREFIX}
-BUILDLINK_FILES.xforms=                include/X11/forms.h
+BUILDLINK_FILES.xforms+=       include/X11/flimage.h
+BUILDLINK_FILES.xforms+=       include/X11/forms.h
+BUILDLINK_FILES.xforms+=       lib/libflimage.*
 BUILDLINK_FILES.xforms+=       lib/libforms.*
-BUILDLINK_FILES.xforms+=       lib/libxforms.*
 
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    xforms-buildlink
	
>Release-Note:
>Audit-Trail:
>Unformatted: