From 76d9714b55f2b83564d56091fa4510f4560250a9 Mon Sep 17 00:00:00 2001
From: marc <marc@openbsd.org>
Date: Fri, 26 Mar 1999 04:50:45 +0000
Subject: [PATCH] touch up packing lists

---
 x11/gtk+/Makefile           | 24 +++++++++++++++++++++---
 x11/gtk+/pkg/PLIST          |  9 ---------
 x11/gtk+/pkg/PLIST.noshared |  9 ---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/x11/gtk+/Makefile b/x11/gtk+/Makefile
index 65f9685f3b3..7a3523df159 100644
--- a/x11/gtk+/Makefile
+++ b/x11/gtk+/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 1999/03/21 05:14:23 brad Exp $
+# $OpenBSD: Makefile,v 1.15 1999/03/26 04:50:45 marc Exp $
 
 DISTNAME=		gtk+-1.2.0
 CATEGORIES=     	x11
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=    glib\\.1\\.2:${PORTSDIR}/devel/glib
+LIB_DEPENDS=    glib.1.2:${PORTSDIR}/devel/glib
 
 USE_X11=		yes
 USE_PERL5=		yes
@@ -25,7 +25,25 @@ CONFIGURE_ARGS+=	--enable-static --sysconfdir=${SYSCONFDIR}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
 
-MAN1=	gtk-config.1
+# People that installed an older version of gtk+ wound up with
+# libglib.a and other things in /usr/X11R6/lib... these files
+# MUST be removed as the version was incorrect (it came from 1.0.6
+# sources). Check that out here (and bitch if necessary).
+# 
+pre-extract:
+	@if [ -f ${X11BASE}/lib/libglib.a ]; then \
+	   echo "+-------------------"; \
+	   echo "| ERROR: you MUST remove the existing gtk+ installation"; \
+	   echo "| before installing this version.  Run these commands"; \
+	   echo "| as user root to remove the package:"; \
+	   echo "|"; \
+	   echo "|	pkg_delete -f `pkg_info -e 'gtk+-*'`"; \
+	   echo "|	ldconfig ${X11BASE}/lib"; \
+	   echo "|	ldconfig -m ${LOCALBASE}/lib"; \
+	   echo "|"; \
+	   echo "+-------------------"; \
+	   exit 1; \
+	fi
 
 post-extract:
 	@${RM} ${WRKSRC}/docs/*.info
diff --git a/x11/gtk+/pkg/PLIST b/x11/gtk+/pkg/PLIST
index d43fb49087d..435006c79cd 100644
--- a/x11/gtk+/pkg/PLIST
+++ b/x11/gtk+/pkg/PLIST
@@ -148,20 +148,11 @@ info/gtk.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gdk.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/gtk.info-6
 share/themes/Default/gtk/gtkrc
 share/aclocal/gtk.m4
 lib/gtk/gtkrc.ja
 lib/gtk/gtkrc.ko
 lib/gtk/gtkrc.ru
 @dirrm lib/gtk
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
 @dirrm include/gtk
 @dirrm include/gdk
diff --git a/x11/gtk+/pkg/PLIST.noshared b/x11/gtk+/pkg/PLIST.noshared
index 274b155f0f5..b2eed3e9a31 100644
--- a/x11/gtk+/pkg/PLIST.noshared
+++ b/x11/gtk+/pkg/PLIST.noshared
@@ -145,20 +145,11 @@ info/gtk.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gdk.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/gtk.info-6
 share/themes/Default/gtk/gtkrc
 share/aclocal/gtk.m4
 lib/gtk/gtkrc.ja
 lib/gtk/gtkrc.ko
 lib/gtk/gtkrc.ru
 @dirrm lib/gtk
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
 @dirrm include/gtk
 @dirrm include/gdk