Move some @exec/@unexec logic out of the PLIST into an INSTALL file.

3 files changed, 28 insertions, 10 deletions

diff --git a/x11/gtk/INSTALL b/x11/gtk/INSTALL
new file mode 100644
index 00000000000..bd87789dd77
--- /dev/null
+++ b/x11/gtk/INSTALL
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2004/01/18 01:11:40 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
+		${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
+			${LOCALBASE}/share/aclocal/gtk.m4
+	fi
+	;;
+DEINSTALL)
+	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
+		${RM} -f ${LOCALBASE}/share/aclocal/gtk.m4
+	fi
+	;;
+esac
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 2afe2975886..6b21e43aeb9 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2004/01/15 13:28:16 mrauch Exp $
+# $NetBSD: Makefile,v 1.96 2004/01/18 01:11:40 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		6
@@ -12,9 +12,11 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		The GIMP Toolkit - libraries for building X11 user interfaces
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+USE_BUILDLINK3=		yes
+
+.include "../../mk/bsd.prefs.mk"
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK3=		yes
 USE_PERL5=		build
 USE_X11BASE=		yes
 USE_GMAKE=		yes
@@ -46,6 +48,12 @@ GTK_MAJOR_VERSION=	${GTK_VERSION:C/\..*//}
 GTK_MINOR_VERSION=	${GTK_VERSION:C/[^.]*\.//:C/\..*//}
 GTK_MICRO_VERSION=	${GTK_VERSION:C/.*\.//}
 
+.if ${PKG_INSTALLATION_TYPE} == "overwrite"
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
+.endif
+
 # We patch the version info in the configure scripts for reasons related to
 # shared library numbering, but we don't want it to leak into the various
 # installed files.  Explicitly replace the version number with the correct
@@ -64,11 +72,6 @@ pre-configure:
 		${RM} $${file}.fixme;					\
 	done
 
-post-install:
-	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
-	  ${LOCALBASE}/share/aclocal/gtk.m4
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST
index a1f70fd2a9f..e4272c8540a 100644
--- a/x11/gtk/PLIST
+++ b/x11/gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/06/25 13:35:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/01/18 01:11:40 jlam Exp $
 bin/gtk-config
 share/gtk/gtkrc.az
 share/gtk/gtkrc.be
@@ -232,8 +232,6 @@ ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
-@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk.m4 ${LOCALBASE}/share/aclocal/gtk.m4
-@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gtk.m4
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
 @dirrm share/themes/Default/gtk
 @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}