[pkgsrc/trunk]: pkgsrc/graphics Update to 0.4.7 and convert to buildlink3.

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/861c2de137b8
branches:  trunk
changeset: 474211:861c2de137b8
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Apr 26 10:19:53 2004 +0000

description:
Update to 0.4.7 and convert to buildlink3.

2004-04-20
        RELEASE alpha version 0.4.7
        * Added life testing against simulated hardware.
        * Made own package for lib subdirectory
        * Fixed missing include in nvtv.c
        * Allow close before open.

2004-03-08
        RELEASE alpha version 0.4.6
        * FreeBSD patch by Samuel Tardieu. (sed instead of expr in configure,
          opl() and ioperm() compatibility functions for FreeBSD.)
        * Added PCI ids. Changed arch setup in back_nvidia.
        * Moved port permissions to mmio.c (not tested for NetBSD).
        * Debugging messages enabled by option instead of define.
        * Fixed missing getHeadDev dispatch in nvtvd.c
        * Removed Chrontel power settings warning.
        * Added Chrontel-2 modes.
        * Renamed PAL 800x600,640x480 and NTSC 640x480,640x400,720x400
          'Large' Chrontel-1 modes to 'Huge' for consistency with Chrontel-2
        * Added some FAQ entries.
        * Start of i865 support.
        * Disable NX support temporarily for release.
        * Fixed excess 1 encoding for i810 registers.
        * Added --list option.
        * Only setup and clamp for TV modes in back_*.
        * Fixed missing devFlags for ACTION_TVOFF
        * Start of i830/i845/CH2 support.
        * I2C bus for i845.
        * RAISE for messages, -q option for nvtvd, syslog.
        * Fixed Debian boot script FAQ.
        * I2C busses don't use X screen index any longer.
        * Fixed Philips detection bug in tv_common.
        * Use CARD8/16/32 as base types.
        * 3 NX modes; NX is partly working.
        * New CX/TW detection (again). CX is tested, TW will be soon.
        * NetBSD patch by Quentin Garnier
        * Added PCI IDs from 1.0-4363
        * Included PAL-X patch 727924 by Joe Cotroneo (joecotroneo).
        * Start of nx (GeForce4 internal) support (not working yet).
        * Fixed missing head in bnv_updateCrt in back_nvidia.

diffstat:

 graphics/nvtv-gtk2/Makefile    |    5 +-
 graphics/nvtv/Makefile         |    4 +-
 graphics/nvtv/Makefile.common  |    8 +-
 graphics/nvtv/distinfo         |   13 +-
 graphics/nvtv/patches/patch-aa |   14 -
 graphics/nvtv/patches/patch-ab |  362 -----------------------------------------
 graphics/nvtv/patches/patch-ad |   87 ---------
 graphics/nvtv/patches/patch-ae |   42 ----
 graphics/nvtv/patches/patch-af |   56 ------
 graphics/nvtv/patches/patch-ag |   14 -
 graphics/nvtv/patches/patch-ah |   55 ------
 11 files changed, 11 insertions(+), 649 deletions(-)

diffs (truncated from 740 to 300 lines):

diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv-gtk2/Makefile
--- a/graphics/nvtv-gtk2/Makefile       Mon Apr 26 09:39:38 2004 +0000
+++ b/graphics/nvtv-gtk2/Makefile       Mon Apr 26 10:19:53 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/26 10:19:53 cube Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-gtk2-/}
-PKGREVISION=   2
 .include "../../graphics/nvtv/Makefile.common"
 
 CONFLICTS=     nvtv-[0-9]*
@@ -11,6 +10,6 @@
 PLIST_SRC=     ${.CURDIR}/../../graphics/nvtv/PLIST
 PATCHDIR=      ${.CURDIR}/../../graphics/nvtv/patches
 
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv/Makefile
--- a/graphics/nvtv/Makefile    Mon Apr 26 09:39:38 2004 +0000
+++ b/graphics/nvtv/Makefile    Mon Apr 26 10:19:53 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/10/05 09:27:28 cube Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/26 10:19:53 cube Exp $
 
 PKGNAME=       ${DISTNAME}
 .include "Makefile.common"
 
 CONFLICTS=     nvtv-gtk2-[0-9]*
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv/Makefile.common
--- a/graphics/nvtv/Makefile.common     Mon Apr 26 09:39:38 2004 +0000
+++ b/graphics/nvtv/Makefile.common     Mon Apr 26 10:19:53 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2003/10/05 09:45:51 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/04/26 10:19:53 cube Exp $
 
-DISTNAME=      nvtv-0.4.5
+DISTNAME=      nvtv-0.4.7
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nv-tv-out/}
 
@@ -10,7 +10,7 @@
 
 ONLY_FOR_PLATFORM=      *-i386
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 RCD_SCRIPTS=           nvtvd
 USE_PKGINSTALL=                YES
@@ -25,4 +25,4 @@
                ${WRKSRC}/doc/overview.txt ${WRKSRC}/doc/timing.txt \
                ${PREFIX}/share/doc/nvtv
 
-.include "../../sysutils/pciutils/buildlink2.mk"
+.include "../../sysutils/pciutils/buildlink3.mk"
diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv/distinfo
--- a/graphics/nvtv/distinfo    Mon Apr 26 09:39:38 2004 +0000
+++ b/graphics/nvtv/distinfo    Mon Apr 26 10:19:53 2004 +0000
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/10/05 09:16:17 cube Exp $
+$NetBSD: distinfo,v 1.2 2004/04/26 10:19:53 cube Exp $
 
-SHA1 (nvtv-0.4.5.tar.gz) = 8b2791301da4af4894b136595fecad7ff91282e6
-Size (nvtv-0.4.5.tar.gz) = 383497 bytes
-SHA1 (patch-aa) = 28d37b601bf86d08f900ff90d4780bacfabbd6b8
-SHA1 (patch-ab) = e73103ebba3fab7da56aa7c77e94ee6a0a331e2c
+SHA1 (nvtv-0.4.7.tar.gz) = 5ea23e4bfcdf91766ec4600a90866a3ccede252b
+Size (nvtv-0.4.7.tar.gz) = 419564 bytes
 SHA1 (patch-ac) = af493d9f8209203b50379f93146ba6504eb39829
-SHA1 (patch-ad) = 0f0b7ab6df8581c4aed078b7e073f7562e123701
-SHA1 (patch-ae) = 9a79ed5920a006ba98db1e8bac312fcb1136c3ff
-SHA1 (patch-af) = 682dc4ef845c0b45116706a7e02689cc503e4abe
-SHA1 (patch-ag) = 6d200843ff83eff7bb4448478ea1940ef3d78b96
-SHA1 (patch-ah) = ba74f956b93b5afd971a499e8b97a1ef6929994e
diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv/patches/patch-aa
--- a/graphics/nvtv/patches/patch-aa    Mon Apr 26 09:39:38 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/05 09:16:17 cube Exp $
-
---- src/config.h.in.orig       2003-06-07 19:22:20.000000000 +0200
-+++ src/config.h.in
-@@ -18,6 +18,9 @@
- /* Define to 1 if pciutils available and used. */
- #undef HAVE_PCI
- 
-+/* Define to 1 if pciutils library is named 'pciutils'. */
-+#undef HAVE_PCIUTILS
-+
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
- 
diff -r 1f81b9792703 -r 861c2de137b8 graphics/nvtv/patches/patch-ab
--- a/graphics/nvtv/patches/patch-ab    Mon Apr 26 09:39:38 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/10/05 09:16:17 cube Exp $
-
---- configure.orig     2003-05-30 11:36:48.000000000 +0200
-+++ configure
-@@ -5101,7 +5101,7 @@ _ACEOF
- 
-   OBJS_EXTRA="$OBJS_EXTRA actions.o"
-   if test ${have_gtk} != no ; then
--    have_gtk_version=`expr substr ${have_gtk} 4 1`
-+    have_gtk_version=`expr ${have_gtk} : '^gtk\([12]\)'`
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_GTK 1
-@@ -5381,6 +5381,135 @@ echo "$as_me: error: math library requir
- fi
- 
- 
-+case ${host} in
-+  *-*-netbsd*)
-+    echo "$as_me:$LINENO: checking for i386_iopl in -li386" >&5
-+echo $ECHO_N "checking for i386_iopl in -li386... $ECHO_C" >&6
-+if test "${ac_cv_lib_i386_i386_iopl+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-li386  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char i386_iopl ();
-+int
-+main ()
-+{
-+i386_iopl ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_i386_i386_iopl=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_i386_i386_iopl=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_i386_i386_iopl" >&5
-+echo "${ECHO_T}$ac_cv_lib_i386_i386_iopl" >&6
-+if test $ac_cv_lib_i386_i386_iopl = yes; then
-+  LIBS="$LIBS -li386"
-+else
-+  { { echo "$as_me:$LINENO: error: NetBSD i386 library required" >&5
-+echo "$as_me: error: NetBSD i386 library required" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+    echo "$as_me:$LINENO: checking for pcibus_conf_read in -lpci" >&5
-+echo $ECHO_N "checking for pcibus_conf_read in -lpci... $ECHO_C" >&6
-+if test "${ac_cv_lib_pci_pcibus_conf_read+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpci  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char pcibus_conf_read ();
-+int
-+main ()
-+{
-+pcibus_conf_read ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_pci_pcibus_conf_read=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_pci_pcibus_conf_read=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_pci_pcibus_conf_read" >&5
-+echo "${ECHO_T}$ac_cv_lib_pci_pcibus_conf_read" >&6
-+if test $ac_cv_lib_pci_pcibus_conf_read = yes; then
-+  LIBS="$LIBS -lpci"
-+else
-+  { { echo "$as_me:$LINENO: error: NetBSD pci library required" >&5
-+echo "$as_me: error: NetBSD pci library required" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+  ;;
-+esac
-+
- if test ${with_winio} = yes ; then
-   echo "$as_me:$LINENO: checking for winio_init in -lwinio" >&5
- echo $ECHO_N "checking for winio_init in -lwinio... $ECHO_C" >&6
-@@ -5502,7 +5631,64 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pci_pci_init" >&5
- echo "${ECHO_T}$ac_cv_lib_pci_pci_init" >&6
- if test $ac_cv_lib_pci_pci_init = yes; then
--  LIBS="$LIBS -lpci"
-+  LIBS="$LIBS -lpci" pciutils_libname="pci"
-+else
-+  echo "$as_me:$LINENO: checking for pci_init in -lpciutils" >&5
-+echo $ECHO_N "checking for pci_init in -lpciutils... $ECHO_C" >&6
-+if test "${ac_cv_lib_pciutils_pci_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpciutils  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char pci_init ();
-+int
-+main ()
-+{
-+pci_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?