pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/gnus Add user-destdir installation support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5eccfee0d4c5
branches:  trunk
changeset: 587126:5eccfee0d4c5
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Apr 01 09:12:04 2011 +0000

description:
Add user-destdir installation support.

diffstat:

 mail/gnus/Makefile                       |   4 +-
 mail/gnus/distinfo                       |   5 ++-
 mail/gnus/patches/patch-etc_Makefile.in  |  39 ++++++++++++++++++++
 mail/gnus/patches/patch-lisp_Makefile.in |  60 ++++++++++++++++++++++++++++++++
 mail/gnus/patches/patch-texi_Makefile.in |  33 +++++++++++++++++
 5 files changed, 139 insertions(+), 2 deletions(-)

diffs (176 lines):

diff -r f2d01ed142d9 -r 5eccfee0d4c5 mail/gnus/Makefile
--- a/mail/gnus/Makefile        Fri Apr 01 01:02:41 2011 +0000
+++ b/mail/gnus/Makefile        Fri Apr 01 09:12:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/03/12 11:46:40 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/01 09:12:04 obache Exp $
 
 DISTNAME=      gnus-5.10.8
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -13,6 +13,8 @@
 
 DEPENDS+=      digest>=20010101:../../pkgtools/digest
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-lispdir=${EMACS_LISPPREFIX}/gnus
 CONFIGURE_ARGS+=       --with-etcdir=${PREFIX}/share/gnus
diff -r f2d01ed142d9 -r 5eccfee0d4c5 mail/gnus/distinfo
--- a/mail/gnus/distinfo        Fri Apr 01 01:02:41 2011 +0000
+++ b/mail/gnus/distinfo        Fri Apr 01 09:12:04 2011 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/11/10 17:57:51 perry Exp $
+$NetBSD: distinfo,v 1.7 2011/04/01 09:12:04 obache Exp $
 
 SHA1 (gnus-5.10.8.tar.gz) = 58ca5ca174140bc824b5e9533a869ae1d3596dc1
 RMD160 (gnus-5.10.8.tar.gz) = 4a2fdea20961d7a714670b59f4d34864ebcaa930
 Size (gnus-5.10.8.tar.gz) = 2496529 bytes
 SHA1 (patch-aa) = f8e6a69610745e16c2fdf319294cf6931e31fe70
+SHA1 (patch-etc_Makefile.in) = 883261477be7bf5214e1e97d08a3238d26f38f77
+SHA1 (patch-lisp_Makefile.in) = a12f6c3b01e2ed64a44cc5634ee0b2cb3c902e98
+SHA1 (patch-texi_Makefile.in) = e2f916f91f98c65f1cd38fe4de1abb42fcde749b
diff -r f2d01ed142d9 -r 5eccfee0d4c5 mail/gnus/patches/patch-etc_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/gnus/patches/patch-etc_Makefile.in   Fri Apr 01 09:12:04 2011 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-etc_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
+
+* staged installation support
+
+--- etc/Makefile.in.orig       2006-01-26 09:17:55.000000000 +0000
++++ etc/Makefile.in
+@@ -14,23 +14,23 @@ INSTALL_DATA = @INSTALL_DATA@
+ SHELL = /bin/sh
+ 
+ install:
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
+       cd $(srcdir) \
+       && for p in gnus-tut.txt; do \
+-        echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+-        $(INSTALL_DATA) $$p $(etcdir)/$$p; \
++        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
++        $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+       done
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)/images/gnus
+       cd $(srcdir) \
+       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
+-        echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+-        $(INSTALL_DATA) $$p $(etcdir)/$$p; \
++        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
++        $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+       done
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)/images/smilies
+       cd $(srcdir) \
+       && for p in images/smilies/*.pbm images/smilies/*.xpm; do \
+-        echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+-        $(INSTALL_DATA) $$p $(etcdir)/$$p; \
++        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
++        $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+       done
+ 
+ uninstall:
diff -r f2d01ed142d9 -r 5eccfee0d4c5 mail/gnus/patches/patch-lisp_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/gnus/patches/patch-lisp_Makefile.in  Fri Apr 01 09:12:04 2011 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-lisp_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
+
+* staged installation support
+
+--- lisp/Makefile.in.orig      2006-01-26 09:01:18.000000000 +0000
++++ lisp/Makefile.in
+@@ -33,38 +33,38 @@ install: install-el-elc list-installed-s
+ 
+ # This entry will never install .el files if there are no .elc files.
+ install-el: gnus-load.el
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
+-      echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
+-      $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
++      echo " $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el"
++      $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el
+       for p in *.elc; do \
+         p=`basename $$p c`; \
+         if [ -f "$(srcdir)/$$p" ]; then \
+-          echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+-          $(INSTALL_DATA) $(srcdir)/$$p $(lispdir)/$$p; \
++          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
++          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(lispdir)/$$p; \
+         fi; \
+       done
+ 
+ install-elc: clever
+       rm -f dgnushack.elc
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
+       for p in *.elc; do \
+-        echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+-        $(INSTALL_DATA) $$p $(lispdir)/$$p; \
++        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
++        $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p; \
+       done
+ 
+ install-el-elc: clever
+       rm -f dgnushack.elc
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
+-      echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
+-      $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)
++      echo " $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el"
++      $(INSTALL_DATA) gnus-load.el $(DESTDIR)$(lispdir)/gnus-load.el
+       for p in *.elc; do \
+         q=`basename $$p c`; \
+         if [ -f "$(srcdir)/$$q" ]; then \
+-          echo " $(INSTALL_DATA) $$q $(lispdir)/$$q"; \
+-          $(INSTALL_DATA) $(srcdir)/$$q $(lispdir)/$$q; \
++          echo " $(INSTALL_DATA) $$q $(DESTDIR)$(lispdir)/$$q"; \
++          $(INSTALL_DATA) $(srcdir)/$$q $(DESTDIR)$(lispdir)/$$q; \
+         fi; \
+-        echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+-        $(INSTALL_DATA) $$p $(lispdir)/$$p; \
++        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p"; \
++        $(INSTALL_DATA) $$p $(DESTDIR)$(lispdir)/$$p; \
+       done
+ 
+ list-installed-shadows:
diff -r f2d01ed142d9 -r 5eccfee0d4c5 mail/gnus/patches/patch-texi_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/gnus/patches/patch-texi_Makefile.in  Fri Apr 01 09:12:04 2011 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-texi_Makefile.in,v 1.1 2011/04/01 09:12:04 obache Exp $
+
+* staged installation support
+
+--- texi/Makefile.in.orig      2006-01-26 09:01:12.000000000 +0000
++++ texi/Makefile.in
+@@ -206,21 +206,21 @@ distclean: clean
+       rm -f gnus-faq.xml gnus-faq.*.tmp
+ 
+ install: $(INFO_DEPS)
+-      $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
++      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+       @list='$(INFO_DEPS)'; \
+       for file in $$list; do \
+         for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+           if test -f $$ifile; then \
+-            echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
+-            $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
++            echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile"; \
++            $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$ifile; \
+           else : ; fi; \
+         done; \
+       done
+       @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+         list='$(INFO_DEPS)'; \
+         for file in $$list; do \
+-          echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
+-          install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
++          echo " install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file";\
++          install-info --info-dir=$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+         done; \
+       else : ; fi
+ 



Home | Main Index | Thread Index | Old Index