pkg/25754: Make arts use the paths provided by buildlink3 and thus pkgview ready.

[Joachim Kuebart <kuebart%mathematik.uni-ulm.de@localhost>]

>Number:         25754
>Category:       pkg
>Synopsis:       Make arts use the paths provided by buildlink3 and thus 
>pkgview ready.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 30 14:01:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Joachim Kuebart
>Release:        NetBSD 2.0B from around April 2, 2004.
>Organization:
>Environment:
        
        
System: NetBSD jaja 2.0B NetBSD 2.0B (ALPHA-$Revision: 1.191 $) #10: Thu Apr 22 
17:37:18 CEST 2004 joki@jaja:/home/joki/NetBSD/compile/JAJA alpha
Architecture: alpha
Machine: alpha
arts-1.2.2
>Description:
Trying to build the arts package under pkgviews fails in the dependency on
the uic tool from qt3-tools.
        
>How-To-Repeat:
Try to build this package when qt3-tools is installed as a pkgview'd
package. Note that qt3-tools is not currently pkgview ready, but see my
mail to tech-pkg from Sun May 30.
        
>Fix:
        
Add a dependency on qt3-tools for uic to the package Makefile.
Make pkg's configure script use $UIC instead of $UIC_PATH to find the uic
tool as it documents in line 31834 and as is the standard for other
packages depending on qt3-tools.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/arts/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile    26 May 2004 01:21:10 -0000      1.31
+++ Makefile    30 May 2004 13:55:30 -0000
@@ -9,6 +9,8 @@
 
 CONFLICTS+=    kdelibs-2*
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 USE_BUILDLINK3=                yes
 USE_PERL5=             build
 
@@ -24,6 +26,7 @@
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/arts/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo    20 Apr 2004 12:15:51 -0000      1.23
+++ distinfo    30 May 2004 13:55:30 -0000
@@ -6,6 +6,6 @@
 SHA1 (patch-ab) = 73c4ec5360ce671f69b6de4e226cda9478d098ee
 SHA1 (patch-ac) = de22843493a184f4aa8c20e011aa2a73ad794728
 SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
-SHA1 (patch-ag) = 30177e80960a2877fb69cb5ffaadc4aa0d0783fc
+SHA1 (patch-ag) = b66105ff4ec4745378d9f6b7861157f76f05b2a4
 SHA1 (patch-ah) = fa4380c6e0049e9ce8851d485c354e07145d9fe9
 SHA1 (patch-ai) = 1299fd6eb7864142dd3f8219660164e6f4ad082a
cvs server: Diffing patches
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/audio/arts/patches/patch-ag,v
retrieving revision 1.3
diff -u -r1.3 patch-ag
--- patches/patch-ag    7 Jul 2003 20:51:55 -0000       1.3
+++ patches/patch-ag    30 May 2004 13:55:31 -0000
@@ -1,8 +1,74 @@
-$NetBSD: patch-ag,v 1.3 2003/07/07 20:51:55 skrll Exp $
+$NetBSD$
 
---- configure.orig     Sat Jan  4 06:07:20 2003
-+++ configure
-@@ -30085,7 +30085,7 @@
+--- configure.orig     2004-04-05 16:30:09.000000000 +0200
++++ configure  2004-05-30 15:32:26.000000000 +0200
+@@ -31769,8 +31769,8 @@
+ 
+    echo "$as_me:$LINENO: checking for uic" >&5
+ echo $ECHO_N "checking for uic... $ECHO_C" >&6
+-   if test -n "$UIC_PATH"; then
+-        kde_cv_path="$UIC_PATH";
++   if test -n "$UIC"; then
++        kde_cv_path="$UIC";
+    else
+         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+ 
+@@ -31816,15 +31816,15 @@
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+       echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+-      UIC_PATH=""
++      UIC=""
+    else
+       echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+ echo "${ECHO_T}$kde_cv_path" >&6
+-      UIC_PATH=$kde_cv_path
++      UIC=$kde_cv_path
+ 
+    fi
+ 
+-     if test -z "$UIC_PATH" ; then
++     if test -z "$UIC" ; then
+ 
+     { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
+ Please check whether you installed Qt correctly.
+@@ -31845,7 +31845,7 @@
+ 
+        exit 1
+      else
+-       UIC=$UIC_PATH
++       UIC=$UIC
+ 
+        if test $kde_qtver = 3; then
+ 
+@@ -31859,7 +31859,7 @@
+         cat >conftest.ui <<EOT
+         <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
+ EOT
+-        ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null"
++        ac_uic_testrun="$UIC -L /nonexistent conftest.ui >/dev/null"
+         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
+   (eval $ac_uic_testrun) 2>&5
+   ac_status=$?
+@@ -31897,7 +31897,7 @@
+         cat >conftest.ui <<EOT
+         <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
+ EOT
+-        ac_uic_testrun="$UIC_PATH -nounload  conftest.ui >/dev/null"
++        ac_uic_testrun="$UIC -nounload  conftest.ui >/dev/null"
+         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
+   (eval $ac_uic_testrun) 2>&5
+   ac_status=$?
+@@ -32336,7 +32336,7 @@
+ 
+ 
+ kde_cv_uic_plugins=no
+-kde_line="$UIC_PATH -L $kde_widgetdir"
++kde_line="$UIC -L $kde_widgetdir"
+ if test x$ac_uic_supports_nounload = xyes; then
+    kde_line="$kde_line -nounload"
+ fi
+@@ -38441,7 +38441,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
  echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
  if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
>Release-Note:
>Audit-Trail:
>Unformatted: