pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors - Added support for installation to DESTDIR.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ddde5478a195
branches: trunk
changeset: 528878:ddde5478a195
user: heinz <heinz%pkgsrc.org@localhost>
date: Fri May 18 23:46:31 2007 +0000
description:
- Added support for installation to DESTDIR.
- Introduced PKGMANDIR.
- check-interpreter.mk complained about dangling symlinks to vim.1 when
installing to DESTDIR. Used CHECK_INTERPRETER_SKIP as a workaround.
diffstat:
editors/vim-motif/Makefile | 19 +++++++++++++------
editors/vim-xaw/Makefile | 21 ++++++++++++++-------
2 files changed, 27 insertions(+), 13 deletions(-)
diffs (94 lines):
diff -r c2898c973898 -r ddde5478a195 editors/vim-motif/Makefile
--- a/editors/vim-motif/Makefile Fri May 18 23:29:08 2007 +0000
+++ b/editors/vim-motif/Makefile Fri May 18 23:46:31 2007 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/05/18 23:55:53 heinz Exp $
PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 Motif GUI
-.include "../../editors/vim-share/Makefile.common"
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../editors/vim-share/Makefile.common"
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
@@ -20,14 +22,19 @@
BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
+
post-install:
.for f in gvim.1 gview.1 rgvim.1 rgview.1
- ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
- ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+ ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+ ${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
.endfor
.for f in gvim gview rgvim rgview rvim rview
- ${RM} -f ${PREFIX:Q}/bin/${f:Q}
- ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+ ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
.endfor
.include "../../devel/ncurses/buildlink3.mk"
diff -r c2898c973898 -r ddde5478a195 editors/vim-xaw/Makefile
--- a/editors/vim-xaw/Makefile Fri May 18 23:29:08 2007 +0000
+++ b/editors/vim-xaw/Makefile Fri May 18 23:46:31 2007 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.44 2006/12/15 20:32:54 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2007/05/18 23:46:31 heinz Exp $
PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
#PKGREVISION= 1
-.include "../../editors/vim-share/Makefile.common"
+COMMENT= Vim editor (vi clone) with X11 Athena GUI
-COMMENT= Vim editor (vi clone) with X11 Athena GUI
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../editors/vim-share/Makefile.common"
DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
@@ -17,6 +19,8 @@
BUILD_TARGET= vim
INSTALL_TARGET= installvimbin
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+
.include "../../mk/bsd.prefs.mk"
.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
@@ -28,14 +32,17 @@
LIBS+= -lXaw
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1
+CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1
+
post-install:
.for f in gvim.1 gview.1 rgvim.1 rgview.1
- ${RM} -f ${PREFIX:Q}/man/man1/${f:Q}
- ${LN} -s vim.1 ${PREFIX:Q}/man/man1/${f:Q}
+ ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
+ ${LN} -s vim.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f:Q}
.endfor
.for f in gvim gview rgvim rgview rvim rview
- ${RM} -f ${PREFIX:Q}/bin/${f:Q}
- ${LN} -s vim ${PREFIX:Q}/bin/${f:Q}
+ ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
+ ${LN} -s vim ${DESTDIR:Q}${PREFIX:Q}/bin/${f:Q}
.endfor
.include "../../devel/ncurses/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index