summaryrefslogtreecommitdiff
path: root/x11/gtk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-06-15 20:40:15 +0000
committerjlam <jlam@pkgsrc.org>2006-06-15 20:40:15 +0000
commit827643d4bb8f5f83c28919b7df0d42108769e37d (patch)
treefdcc07230f85f6fc9861a7659692fa83b1801fd4 /x11/gtk
parent16435dbba43f2f98501e2daefad890a6542aab31 (diff)
downloadpkgsrc-827643d4bb8f5f83c28919b7df0d42108769e37d.tar.gz
Split out deinstall portions of INSTALL scripts into DEINSTALL scripts.
This avoids the need for a confusing line of the form: DEINSTALL_TEMPLATE+= path/to/INSTALL in the package Makefile, and actually removes the need to specify it altogether since by convention, the existence of the DEINSTALL script is enough to add it to DEINSTALL_TEMPLATE.
Diffstat (limited to 'x11/gtk')
-rw-r--r--x11/gtk/DEINSTALL11
-rw-r--r--x11/gtk/INSTALL7
-rw-r--r--x11/gtk/Makefile6
3 files changed, 13 insertions, 11 deletions
diff --git a/x11/gtk/DEINSTALL b/x11/gtk/DEINSTALL
new file mode 100644
index 00000000000..0b1d0a2eb5f
--- /dev/null
+++ b/x11/gtk/DEINSTALL
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+ if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
+ ${RM} -f ${LOCALBASE}/share/aclocal/gtk.m4
+ fi
+ ;;
+esac
diff --git a/x11/gtk/INSTALL b/x11/gtk/INSTALL
index bd87789dd77..db22277df73 100644
--- a/x11/gtk/INSTALL
+++ b/x11/gtk/INSTALL
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: INSTALL,v 1.1 2004/01/18 01:11:40 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
case ${STAGE} in
POST-INSTALL)
@@ -9,9 +9,4 @@ POST-INSTALL)
${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 2674737d727..dfb6aad60b6 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2006/04/29 16:58:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.119 2006/06/15 20:40:16 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 9
@@ -44,10 +44,6 @@ GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//}
GTK_MINOR_VERSION= ${GTK_VERSION:C/[^.]*\.//:C/\..*//}
GTK_MICRO_VERSION= ${GTK_VERSION:C/.*\.//}
-.if ${PKG_INSTALLATION_TYPE} == "overwrite"
-DEINSTALL_TEMPLATE+= ${PKGDIR}/INSTALL
-.endif
-
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mmipspro*)