[pkgsrc/trunk]: pkgsrc/lang/ucblogo Support staged installation.

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dfe1471148c
branches:  trunk
changeset: 568322:0dfe1471148c
user:      asau <asau%pkgsrc.org@localhost>
date:      Thu Dec 10 23:42:14 2009 +0000

description:
Support staged installation.

diffstat:

 lang/ucblogo/Makefile         |  12 +++++++-----
 lang/ucblogo/distinfo         |   4 ++--
 lang/ucblogo/patches/patch-aa |  27 ++++++++++++++++-----------
 3 files changed, 25 insertions(+), 18 deletions(-)

diffs (102 lines):

diff -r b67854a86ef6 -r 0dfe1471148c lang/ucblogo/Makefile
--- a/lang/ucblogo/Makefile     Thu Dec 10 23:40:00 2009 +0000
+++ b/lang/ucblogo/Makefile     Thu Dec 10 23:42:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/02/19 19:51:17 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/12/10 23:42:14 asau Exp $
 
 DISTNAME=      ucblogo-5.3
 PKGREVISION=   2
@@ -11,16 +11,18 @@
 HOMEPAGE=      http://http.cs.berkeley.edu/~bh/logo.html
 COMMENT=       Brian Harvey's logo language interpreter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_FILE=     makefile
 GNU_CONFIGURE= yes
 # otherwise ./configure guesses -L incorrectly
 LIBS+=         -L${X11BASE}/lib
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo
-       ${INSTALL_DATA} ${WRKSRC}/usermanual ${PREFIX}/share/doc/ucblogo/usermanual.txt
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo/html
-       ${CP} ${WRKSRC}/emacs/docs/*.html ${PREFIX}/share/doc/ucblogo/html/
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ucblogo
+       ${INSTALL_DATA} ${WRKSRC}/usermanual ${DESTDIR}${PREFIX}/share/doc/ucblogo/usermanual.txt
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ucblogo/html
+       ${CP} ${WRKSRC}/emacs/docs/*.html ${DESTDIR}${PREFIX}/share/doc/ucblogo/html/
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r b67854a86ef6 -r 0dfe1471148c lang/ucblogo/distinfo
--- a/lang/ucblogo/distinfo     Thu Dec 10 23:40:00 2009 +0000
+++ b/lang/ucblogo/distinfo     Thu Dec 10 23:42:14 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/12/10 23:42:14 asau Exp $
 
 SHA1 (ucblogo-5.3.tar.gz) = abe27b2a36cc5d8dc4208fba04569e82cc163719
 RMD160 (ucblogo-5.3.tar.gz) = 9dfaf9886335ff7624e72cd23d0fd28a80e679c3
 Size (ucblogo-5.3.tar.gz) = 1180188 bytes
-SHA1 (patch-aa) = 5392d5d0430830f40f468449f57905ec69151b33
+SHA1 (patch-aa) = 7e3ab4e800f726dea6e6a46eb22ee6b7b8b03509
diff -r b67854a86ef6 -r 0dfe1471148c lang/ucblogo/patches/patch-aa
--- a/lang/ucblogo/patches/patch-aa     Thu Dec 10 23:40:00 2009 +0000
+++ b/lang/ucblogo/patches/patch-aa     Thu Dec 10 23:42:14 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/07/23 00:31:23 reed Exp $
+$NetBSD: patch-aa,v 1.4 2009/12/10 23:42:14 asau Exp $
 
---- makefile.in.orig   Wed Sep 11 15:02:00 2002
-+++ makefile.in
-@@ -3,8 +3,9 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ 
+--- makefile.in.orig   2002-09-12 02:02:00.000000000 +0400
++++ makefile.in        2009-12-11 02:37:33.000000000 +0300
+@@ -3,8 +3,9 @@
  LDFLAGS       = @LDFLAGS@
  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
  prefix = @prefix@
@@ -13,7 +13,7 @@
  
  # LIBLOC      = `pwd`
  
-@@ -18,7 +19,7 @@ SRCS = coms.c error.c eval.c files.c gra
+@@ -18,7 +19,7 @@
  
  HDRS  = globals.h logo.h xgraphics.h
  
@@ -22,7 +22,7 @@
  
  mem.o:        mem.c
        $(CC) $(CFLAGS) -O0 -c mem.c
-@@ -54,12 +55,12 @@ makehelp:  makehelp.c
+@@ -54,25 +55,25 @@
  
  clean:
        rm -f *.o libloc.c
@@ -36,13 +36,18 @@
 +      cd emacs; $(MAKE) ship
  
  install: all
-       for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
-@@ -67,12 +68,12 @@ install: all
-       cp -f logolib/* $(LIBLOC)/logolib/.
-       cp -f helpfiles/* $(LIBLOC)/helpfiles/.
-       cp -f csls/* $(LIBLOC)/csls/.
+-      for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
+-      cp logo $(BINDIR)/.
+-      cp -f logolib/* $(LIBLOC)/logolib/.
+-      cp -f helpfiles/* $(LIBLOC)/helpfiles/.
+-      cp -f csls/* $(LIBLOC)/csls/.
 -      (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install)
 -#     prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install
++      for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $(DESTDIR)$$d ] || mkdir -p $(DESTDIR)$$d || exit 1; done
++      cp logo $(DESTDIR)$(BINDIR)/.
++      cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/.
++      cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/.
++      cp -f csls/* $(DESTDIR)$(LIBLOC)/csls/.
 +#     (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
 +#     prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install