pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gtk Move some @exec/@unexec logic out of the PLIST...
details: https://anonhg.NetBSD.org/pkgsrc/rev/92672008f002
branches: trunk
changeset: 466424:92672008f002
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Jan 18 01:11:40 2004 +0000
description:
Move some @exec/@unexec logic out of the PLIST into an INSTALL file.
diffstat:
x11/gtk/INSTALL | 17 +++++++++++++++++
x11/gtk/Makefile | 17 ++++++++++-------
x11/gtk/PLIST | 4 +---
3 files changed, 28 insertions(+), 10 deletions(-)
diffs (86 lines):
diff -r d2abe46af87c -r 92672008f002 x11/gtk/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk/INSTALL Sun Jan 18 01:11:40 2004 +0000
@@ -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 -r d2abe46af87c -r 92672008f002 x11/gtk/Makefile
--- a/x11/gtk/Makefile Sun Jan 18 00:51:30 2004 +0000
+++ b/x11/gtk/Makefile Sun Jan 18 01:11:40 2004 +0000
@@ -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 @@
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_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 @@
${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 -r d2abe46af87c -r 92672008f002 x11/gtk/PLIST
--- a/x11/gtk/PLIST Sun Jan 18 00:51:30 2004 +0000
+++ b/x11/gtk/PLIST Sun Jan 18 01:11:40 2004 +0000
@@ -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/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}
Home |
Main Index |
Thread Index |
Old Index