USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 149 insertions, 170 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index a69d11e388d..c84b7b129e2 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:43 rh Exp $
+# $NetBSD: Makefile,v 1.20 2000/06/20 23:51:04 jlam Exp $
 
 DISTNAME=		control-center-1.2.0
 CATEGORIES=		x11 gnome
@@ -9,10 +9,11 @@ HOMEPAGE=		http://www.gnome.org/
 
 DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 
-GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_PKGLIBTOOL=		yes
+GNU_CONFIGURE=		# defined
+USE_X11BASE=		# defined
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LOCALSTATEDIR=		/var/gnome
 
diff --git a/x11/controlcenter/files/patch-sum b/x11/controlcenter/files/patch-sum
index 7481bfbafb9..f1031c00f64 100644
--- a/x11/controlcenter/files/patch-sum
+++ b/x11/controlcenter/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/05/30 19:26:23 drochner Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/20 23:51:05 jlam Exp $
 
 MD5 (patch-aa) = cd325a544a883a4c3102c043e3ca384c
-MD5 (patch-an) = 4845f73d5f773a0a688154f5762cda23
diff --git a/x11/controlcenter/patches/patch-an b/x11/controlcenter/patches/patch-an
deleted file mode 100644
index f9b586cd1e3..00000000000
--- a/x11/controlcenter/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/05/30 19:28:21 drochner Exp $
-
---- configure.orig	Sun May 28 17:02:45 2000
-+++ configure	Sun May 28 17:03:39 2000
-@@ -2137,6 +2137,8 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
-+
- # Check for any special flags to pass to ltconfig.
- #
- # the following will cause an existing older ltconfig to fail, so
-@@ -2299,6 +2301,8 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+
-+fi
- 
- missing_dir=`cd $ac_aux_dir && pwd`
- for ac_prog in flex lex
diff --git a/x11/controlcenter/pkg/PLIST b/x11/controlcenter/pkg/PLIST
index 2a96c08411e..7484feef016 100644
--- a/x11/controlcenter/pkg/PLIST
+++ b/x11/controlcenter/pkg/PLIST
@@ -1,189 +1,102 @@
-@comment $NetBSD: PLIST,v 1.5 2000/05/30 19:26:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/06/20 23:51:06 jlam Exp $
+bin/background-properties-capplet
+bin/gnome-edit-properties-capplet
 bin/gnomecc
+bin/keyboard-properties
+bin/mime-type-capplet
 bin/mouse-properties-capplet
 bin/screensaver-properties-capplet
-bin/background-properties-capplet
-bin/theme-selector-capplet
+bin/session-properties-capplet
 bin/sound-properties
+bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
-bin/gnome-edit-properties-capplet
-bin/session-properties-capplet
 bin/wm-properties-capplet
-bin/keyboard-properties
-bin/mime-type-capplet
 etc/CORBA/servers/gnomecc.gnorba
 include/capplet-widget.h
-lib/libcapplet.so.0.0
-lib/libcapplet.a
 lib/cappletConf.sh
-share/pixmaps/control-center.png
-share/idl/control-center.idl
-share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/apps/Settings/Desktop/.directory
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-share/gnome/apps/Settings/Desktop/background-properties.desktop
-share/gnome/apps/Settings/Desktop/theme-selector.desktop
-share/gnome/apps/Settings/Desktop/wm-properties.desktop
-share/gnome/apps/Settings/Documents/.directory
-share/gnome/apps/Settings/Documents/url-properties.desktop
-share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-share/gnome/apps/Settings/Documents/mime-type.desktop
-share/gnome/apps/Settings/Multimedia/.directory
-share/gnome/apps/Settings/Multimedia/sound-properties.desktop
-share/gnome/apps/Settings/Session/.directory
-share/gnome/apps/Settings/Session/session-properties.desktop
-share/gnome/apps/Settings/UIOptions/.directory
-share/gnome/apps/Settings/UIOptions/application.desktop
-share/gnome/apps/Settings/UIOptions/dialogs.desktop
-share/gnome/apps/Settings/UIOptions/mdi.desktop
-share/gnome/apps/Settings/Peripherals/.directory
-share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/topic.dat
-share/gnome/help/control-center/C/figs/bg-capplet.png
-share/gnome/help/control-center/C/figs/gccappdef.png
-share/gnome/help/control-center/C/figs/gccdialog.png
-share/gnome/help/control-center/C/figs/gccedit.png
-share/gnome/help/control-center/C/figs/gcchints.png
-share/gnome/help/control-center/C/figs/gccmdi.png
-share/gnome/help/control-center/C/figs/gccmime.png
-share/gnome/help/control-center/C/figs/gccsession-props.png
-share/gnome/help/control-center/C/figs/gccsound1.png
-share/gnome/help/control-center/C/figs/gccsound2.png
-share/gnome/help/control-center/C/figs/gccstartup.png
-share/gnome/help/control-center/C/figs/gccurl.png
-share/gnome/help/control-center/C/figs/glob_pref_anim.png
-share/gnome/help/control-center/C/figs/keyboard-capplet.png
-share/gnome/help/control-center/C/figs/mouse-capplet.png
-share/gnome/help/control-center/C/figs/screensave-capplet.png
-share/gnome/help/control-center/C/figs/theme-select.png
-share/gnome/help/control-center/C/figs/wm-main.png
-share/gnome/wm-properties/Enlightenment.desktop
-share/gnome/wm-properties/IceWM.desktop
-share/gnome/wm-properties/WindowMaker.desktop
-share/gnome/wm-properties/Scwm.desktop
-share/gnome/wm-properties/twm.desktop
-share/control-center/Desktop/.directory
-share/control-center/Desktop/screensaver-properties.desktop
-share/control-center/Desktop/background-properties.desktop
-share/control-center/Desktop/theme-selector.desktop
-share/control-center/Desktop/wm-properties.desktop
-share/control-center/Documents/.directory
-share/control-center/Documents/gnome-edit-properties.desktop
-share/control-center/Documents/mime-type.desktop
-share/control-center/Documents/url-properties.desktop
-share/control-center/Multimedia/.directory
-share/control-center/Multimedia/sound-properties.desktop
-share/control-center/Session/.directory
-share/control-center/Session/session-properties.desktop
-share/control-center/UIOptions/.directory
-share/control-center/UIOptions/application.desktop
-share/control-center/UIOptions/dialogs.desktop
-share/control-center/UIOptions/mdi.desktop
-share/control-center/Peripherals/.directory
-share/control-center/Peripherals/mouse-properties.desktop
-share/control-center/Peripherals/keyboard-properties.desktop
-share/control-center/.directory
-share/control-center/.data/Qix.desktop
-share/control-center/.data/qix.png
-share/control-center/.data/Deco.desktop
-share/control-center/.data/deco.png
+lib/libcapplet.a
+lib/libcapplet.la
+lib/libcapplet.so.0.0
 share/control-center/.data/3d.desktop
+share/control-center/.data/3d.png
 share/control-center/.data/Ant.desktop
-share/control-center/.data/ant.png
+share/control-center/.data/Atlantis.desktop
 share/control-center/.data/Attraction.desktop
-share/control-center/.data/attraction.png
 share/control-center/.data/Blitspin.desktop
-share/control-center/.data/blitspin.png
 share/control-center/.data/Bouboule.desktop
-share/control-center/.data/bouboule.png
 share/control-center/.data/Braid.desktop
-share/control-center/.data/braid.png
 share/control-center/.data/Bsod.desktop
-share/control-center/.data/bsod.png
+share/control-center/.data/Bubble3d.desktop
 share/control-center/.data/Bubbles.desktop
-share/control-center/.data/bubbles.png
+share/control-center/.data/Cage.desktop
 share/control-center/.data/Coral.desktop
-share/control-center/.data/coral.png
-share/control-center/.data/drift.png
 share/control-center/.data/Cynosure.desktop
-share/control-center/.data/cynosure.png
 share/control-center/.data/Decayscreen.desktop
+share/control-center/.data/Deco.desktop
 share/control-center/.data/Demon.desktop
-share/control-center/.data/decayscreen.png
 share/control-center/.data/Discrete.desktop
-share/control-center/.data/discrete.png
 share/control-center/.data/Distort.desktop
 share/control-center/.data/Drift.desktop
 share/control-center/.data/Epicycle.desktop
-share/control-center/.data/epicycle.png
 share/control-center/.data/Fadeplot.desktop
 share/control-center/.data/Flag.desktop
-share/control-center/.data/flag.png
 share/control-center/.data/Flame.desktop
-share/control-center/.data/flame.png
 share/control-center/.data/Flow.desktop
 share/control-center/.data/Forest.desktop
-share/control-center/.data/forest.png
+share/control-center/.data/GLPlanet.desktop
 share/control-center/.data/Galaxy.desktop
+share/control-center/.data/Gears.desktop
 share/control-center/.data/Goop.desktop
-share/control-center/.data/goop.png
 share/control-center/.data/Grav.desktop
-share/control-center/.data/grav.png
 share/control-center/.data/Greynetic.desktop
-share/control-center/.data/greynetic.png
 share/control-center/.data/Halo.desktop
-share/control-center/.data/halo.png
 share/control-center/.data/Helix.desktop
-share/control-center/.data/helix.png
 share/control-center/.data/Hopalong.desktop
-share/control-center/.data/hopalong.png
 share/control-center/.data/Hypercube.desktop
-share/control-center/.data/hypercube.png
 share/control-center/.data/Ifs.desktop
-share/control-center/.data/ifs.png
 share/control-center/.data/Imsmap.desktop
 share/control-center/.data/Interference.desktop
 share/control-center/.data/Jigsaw.desktop
 share/control-center/.data/Julia.desktop
-share/control-center/.data/julia.png
 share/control-center/.data/Kaleidescope.desktop
-share/control-center/.data/kaleidescope.png
 share/control-center/.data/Kumppa.desktop
+share/control-center/.data/Lament.desktop
 share/control-center/.data/Laser.desktop
-share/control-center/.data/laser.png
 share/control-center/.data/Lightning.desktop
-share/control-center/.data/lightning.png
 share/control-center/.data/Lisa.desktop
-share/control-center/.data/lisa.png
 share/control-center/.data/Lissie.desktop
 share/control-center/.data/Lmorph.desktop
 share/control-center/.data/Loop.desktop
 share/control-center/.data/Maze.desktop
-share/control-center/.data/maze.png
+share/control-center/.data/Moebius.desktop
 share/control-center/.data/Moire.desktop
 share/control-center/.data/Moire2.desktop
+share/control-center/.data/Morph3d.desktop
 share/control-center/.data/Mountain.desktop
 share/control-center/.data/Munch.desktop
 share/control-center/.data/Noseguy.desktop
 share/control-center/.data/Pedal.desktop
 share/control-center/.data/Penrose.desktop
+share/control-center/.data/Pipes.desktop
 share/control-center/.data/Pyro.desktop
+share/control-center/.data/Qix.desktop
 share/control-center/.data/Rd-bomb.desktop
 share/control-center/.data/Rocks.desktop
 share/control-center/.data/Rorschach.desktop
 share/control-center/.data/Rotor.desktop
+share/control-center/.data/Rubik.desktop
 share/control-center/.data/Sierpinski.desktop
 share/control-center/.data/Slidescreen.desktop
 share/control-center/.data/Slip.desktop
 share/control-center/.data/Sonar.desktop
 share/control-center/.data/Sphere.desktop
 share/control-center/.data/Spiral.desktop
+share/control-center/.data/Sproingies.desktop
+share/control-center/.data/Stairs.desktop
 share/control-center/.data/Starfish.desktop
-share/control-center/.data/starfish.png
 share/control-center/.data/Strange.desktop
+share/control-center/.data/Superquadrics.desktop
 share/control-center/.data/Swirl.desktop
 share/control-center/.data/Triangle.desktop
 share/control-center/.data/Truchet.desktop
@@ -191,48 +104,136 @@ share/control-center/.data/Vines.desktop
 share/control-center/.data/Worm.desktop
 share/control-center/.data/Xjack.desktop
 share/control-center/.data/Xlyap.desktop
+share/control-center/.data/Xmatrix.desktop
 share/control-center/.data/Xroger.desktop
-share/control-center/.data/3d.png
-share/control-center/.data/Atlantis.desktop
-share/control-center/.data/Bubble3d.desktop
-share/control-center/.data/Cage.desktop
-share/control-center/.data/Gears.desktop
-share/control-center/.data/GLPlanet.desktop
-share/control-center/.data/Lament.desktop
+share/control-center/.data/ant.png
+share/control-center/.data/attraction.png
+share/control-center/.data/blitspin.png
+share/control-center/.data/bouboule.png
+share/control-center/.data/braid.png
+share/control-center/.data/bsod.png
+share/control-center/.data/bubbles.png
+share/control-center/.data/coral.png
+share/control-center/.data/cynosure.png
+share/control-center/.data/decayscreen.png
+share/control-center/.data/deco.png
+share/control-center/.data/discrete.png
+share/control-center/.data/drift.png
+share/control-center/.data/epicycle.png
+share/control-center/.data/flag.png
+share/control-center/.data/flame.png
+share/control-center/.data/forest.png
+share/control-center/.data/goop.png
+share/control-center/.data/grav.png
+share/control-center/.data/greynetic.png
+share/control-center/.data/halo.png
+share/control-center/.data/helix.png
+share/control-center/.data/hopalong.png
+share/control-center/.data/hypercube.png
+share/control-center/.data/ifs.png
+share/control-center/.data/julia.png
+share/control-center/.data/kaleidescope.png
+share/control-center/.data/laser.png
+share/control-center/.data/lightning.png
+share/control-center/.data/lisa.png
 share/control-center/.data/lmorph.png
-share/control-center/.data/Moebius.desktop
+share/control-center/.data/maze.png
 share/control-center/.data/moire.png
-share/control-center/.data/Morph3d.desktop
 share/control-center/.data/munch.png
 share/control-center/.data/pedal.png
-share/control-center/.data/Pipes.desktop
-share/control-center/.data/Rubik.desktop
+share/control-center/.data/qix.png
 share/control-center/.data/sierpinski.png
 share/control-center/.data/spiral.png
-share/control-center/.data/Sproingies.desktop
-share/control-center/.data/Stairs.desktop
-share/control-center/.data/Superquadrics.desktop
+share/control-center/.data/starfish.png
 share/control-center/.data/vines.png
 share/control-center/.data/xroger.png
-share/control-center/.data/Xmatrix.desktop
+share/control-center/.directory
+share/control-center/Desktop/.directory
+share/control-center/Desktop/background-properties.desktop
+share/control-center/Desktop/screensaver-properties.desktop
+share/control-center/Desktop/theme-selector.desktop
+share/control-center/Desktop/wm-properties.desktop
+share/control-center/Documents/.directory
+share/control-center/Documents/gnome-edit-properties.desktop
+share/control-center/Documents/mime-type.desktop
+share/control-center/Documents/url-properties.desktop
+share/control-center/Multimedia/.directory
+share/control-center/Multimedia/sound-properties.desktop
+share/control-center/Peripherals/.directory
+share/control-center/Peripherals/keyboard-properties.desktop
+share/control-center/Peripherals/mouse-properties.desktop
+share/control-center/Session/.directory
+share/control-center/Session/session-properties.desktop
+share/control-center/UIOptions/.directory
+share/control-center/UIOptions/application.desktop
+share/control-center/UIOptions/dialogs.desktop
+share/control-center/UIOptions/mdi.desktop
+share/gnome/apps/Settings/Desktop/.directory
+share/gnome/apps/Settings/Desktop/background-properties.desktop
+share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+share/gnome/apps/Settings/Desktop/theme-selector.desktop
+share/gnome/apps/Settings/Desktop/wm-properties.desktop
+share/gnome/apps/Settings/Documents/.directory
+share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
+share/gnome/apps/Settings/Documents/mime-type.desktop
+share/gnome/apps/Settings/Documents/url-properties.desktop
+share/gnome/apps/Settings/Multimedia/.directory
+share/gnome/apps/Settings/Multimedia/sound-properties.desktop
+share/gnome/apps/Settings/Peripherals/.directory
+share/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
+share/gnome/apps/Settings/Peripherals/mouse-properties.desktop
+share/gnome/apps/Settings/Session/.directory
+share/gnome/apps/Settings/Session/session-properties.desktop
+share/gnome/apps/Settings/UIOptions/.directory
+share/gnome/apps/Settings/UIOptions/application.desktop
+share/gnome/apps/Settings/UIOptions/dialogs.desktop
+share/gnome/apps/Settings/UIOptions/mdi.desktop
+share/gnome/apps/Settings/gnomecc.desktop
+share/gnome/help/control-center/C/figs/bg-capplet.png
+share/gnome/help/control-center/C/figs/gccappdef.png
+share/gnome/help/control-center/C/figs/gccdialog.png
+share/gnome/help/control-center/C/figs/gccedit.png
+share/gnome/help/control-center/C/figs/gcchints.png
+share/gnome/help/control-center/C/figs/gccmdi.png
+share/gnome/help/control-center/C/figs/gccmime.png
+share/gnome/help/control-center/C/figs/gccsession-props.png
+share/gnome/help/control-center/C/figs/gccsound1.png
+share/gnome/help/control-center/C/figs/gccsound2.png
+share/gnome/help/control-center/C/figs/gccstartup.png
+share/gnome/help/control-center/C/figs/gccurl.png
+share/gnome/help/control-center/C/figs/glob_pref_anim.png
+share/gnome/help/control-center/C/figs/keyboard-capplet.png
+share/gnome/help/control-center/C/figs/mouse-capplet.png
+share/gnome/help/control-center/C/figs/screensave-capplet.png
+share/gnome/help/control-center/C/figs/theme-select.png
+share/gnome/help/control-center/C/figs/wm-main.png
+share/gnome/help/control-center/C/index.html
+share/gnome/help/control-center/C/topic.dat
+share/gnome/wm-properties/Enlightenment.desktop
+share/gnome/wm-properties/IceWM.desktop
+share/gnome/wm-properties/Scwm.desktop
+share/gnome/wm-properties/WindowMaker.desktop
+share/gnome/wm-properties/twm.desktop
+share/idl/control-center.idl
 share/pixmaps/ccsplash.png
-@dirrm share/gnome/apps/Settings/Desktop
-@dirrm share/gnome/apps/Settings/Documents
-@dirrm share/gnome/apps/Settings/Multimedia
-@dirrm share/gnome/apps/Settings/Session
-@dirrm share/gnome/apps/Settings/UIOptions
-@dirrm share/gnome/apps/Settings/Peripherals
-@dirrm share/gnome/apps/Settings
-@dirrm share/gnome/help/control-center/C/figs
+share/pixmaps/control-center.png
+@dirrm share/gnome/wm-properties
 @dirrm share/gnome/help/control-center/C/stylesheet-images
+@dirrm share/gnome/help/control-center/C/figs
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
-@dirrm share/gnome/wm-properties
-@dirrm share/control-center/Desktop
-@dirrm share/control-center/Documents
-@dirrm share/control-center/Multimedia
-@dirrm share/control-center/Session
+@dirrm share/gnome/apps/Settings/UIOptions
+@dirrm share/gnome/apps/Settings/Session
+@dirrm share/gnome/apps/Settings/Peripherals
+@dirrm share/gnome/apps/Settings/Multimedia
+@dirrm share/gnome/apps/Settings/Documents
+@dirrm share/gnome/apps/Settings/Desktop
+@dirrm share/gnome/apps/Settings
 @dirrm share/control-center/UIOptions
+@dirrm share/control-center/Session
 @dirrm share/control-center/Peripherals
+@dirrm share/control-center/Multimedia
+@dirrm share/control-center/Documents
+@dirrm share/control-center/Desktop
 @dirrm share/control-center/.data
 @dirrm share/control-center