Thu Dec 10 23:42:14 2009 UTC ()
Support staged installation.


(asau)
diff -r1.19 -r1.20 pkgsrc/lang/ucblogo/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/ucblogo/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/ucblogo/patches/patch-aa
cvs diff -r1.19 -r1.20 pkgsrc/lang/ucblogo/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/Makefile 2007/02/19 19:51:17 1.19
+++ pkgsrc/lang/ucblogo/Makefile 2009/12/10 23:42:14 1.20
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.19 2007/02/19 19:51:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.20 2009/12/10 23:42:14 asau Exp $
2 2
3DISTNAME= ucblogo-5.3 3DISTNAME= ucblogo-5.3
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ftp://ftp.cs.berkeley.edu/pub/ucblogo/ 6MASTER_SITES= ftp://ftp.cs.berkeley.edu/pub/ucblogo/
7# Not at GNU mirrors yet 7# Not at GNU mirrors yet
8# ${MASTER_SITE_GNU:=non-gnu/ucblogo/} \ 8# ${MASTER_SITE_GNU:=non-gnu/ucblogo/} \
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://http.cs.berkeley.edu/~bh/logo.html 11HOMEPAGE= http://http.cs.berkeley.edu/~bh/logo.html
12COMMENT= Brian Harvey's logo language interpreter 12COMMENT= Brian Harvey's logo language interpreter
13 13
 14PKG_DESTDIR_SUPPORT= user-destdir
 15
14MAKE_FILE= makefile 16MAKE_FILE= makefile
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16# otherwise ./configure guesses -L incorrectly 18# otherwise ./configure guesses -L incorrectly
17LIBS+= -L${X11BASE}/lib 19LIBS+= -L${X11BASE}/lib
18 20
19post-install: 21post-install:
20 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo 22 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ucblogo
21 ${INSTALL_DATA} ${WRKSRC}/usermanual ${PREFIX}/share/doc/ucblogo/usermanual.txt 23 ${INSTALL_DATA} ${WRKSRC}/usermanual ${DESTDIR}${PREFIX}/share/doc/ucblogo/usermanual.txt
22 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo/html 24 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/ucblogo/html
23 ${CP} ${WRKSRC}/emacs/docs/*.html ${PREFIX}/share/doc/ucblogo/html/ 25 ${CP} ${WRKSRC}/emacs/docs/*.html ${DESTDIR}${PREFIX}/share/doc/ucblogo/html/
24 26
25BUILDLINK_DEPMETHOD.libXt?= build 27BUILDLINK_DEPMETHOD.libXt?= build
26 28
27.include "../../devel/ncurses/buildlink3.mk" 29.include "../../devel/ncurses/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 30.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXt/buildlink3.mk" 31.include "../../x11/libXt/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/lang/ucblogo/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/distinfo 2005/02/24 09:03:12 1.5
+++ pkgsrc/lang/ucblogo/distinfo 2009/12/10 23:42:14 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $ 1$NetBSD: distinfo,v 1.6 2009/12/10 23:42:14 asau Exp $
2 2
3SHA1 (ucblogo-5.3.tar.gz) = abe27b2a36cc5d8dc4208fba04569e82cc163719 3SHA1 (ucblogo-5.3.tar.gz) = abe27b2a36cc5d8dc4208fba04569e82cc163719
4RMD160 (ucblogo-5.3.tar.gz) = 9dfaf9886335ff7624e72cd23d0fd28a80e679c3 4RMD160 (ucblogo-5.3.tar.gz) = 9dfaf9886335ff7624e72cd23d0fd28a80e679c3
5Size (ucblogo-5.3.tar.gz) = 1180188 bytes 5Size (ucblogo-5.3.tar.gz) = 1180188 bytes
6SHA1 (patch-aa) = 5392d5d0430830f40f468449f57905ec69151b33 6SHA1 (patch-aa) = 7e3ab4e800f726dea6e6a46eb22ee6b7b8b03509
cvs diff -r1.3 -r1.4 pkgsrc/lang/ucblogo/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/patches/Attic/patch-aa 2004/07/23 00:31:23 1.3
+++ pkgsrc/lang/ucblogo/patches/Attic/patch-aa 2009/12/10 23:42:14 1.4
@@ -1,57 +1,62 @@ @@ -1,57 +1,62 @@
1$NetBSD: patch-aa,v 1.3 2004/07/23 00:31:23 reed Exp $ 1$NetBSD: patch-aa,v 1.4 2009/12/10 23:42:14 asau Exp $
2 2
3--- makefile.in.orig Wed Sep 11 15:02:00 2002 3--- makefile.in.orig 2002-09-12 02:02:00.000000000 +0400
4+++ makefile.in 4+++ makefile.in 2009-12-11 02:37:33.000000000 +0300
5@@ -3,8 +3,9 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@  5@@ -3,8 +3,9 @@
6 LDFLAGS = @LDFLAGS@ 6 LDFLAGS = @LDFLAGS@
7 LIBS = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@ 7 LIBS = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
8 prefix = @prefix@ 8 prefix = @prefix@
9+datadir = @datadir@ 9+datadir = @datadir@
10 BINDIR = $(prefix)/bin 10 BINDIR = $(prefix)/bin
11-LIBLOC = $(prefix)/lib/logo 11-LIBLOC = $(prefix)/lib/logo
12+LIBLOC = $(datadir)/ucblogo 12+LIBLOC = $(datadir)/ucblogo
13  13
14 # LIBLOC = `pwd` 14 # LIBLOC = `pwd`
15  15
16@@ -18,7 +19,7 @@ SRCS = coms.c error.c eval.c files.c gra 16@@ -18,7 +19,7 @@
17  17
18 HDRS = globals.h logo.h xgraphics.h 18 HDRS = globals.h logo.h xgraphics.h
19  19
20-all: logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode 20-all: logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
21+all: logo logolib helpfiles helpfiles/HELPCONTENTS 21+all: logo logolib helpfiles helpfiles/HELPCONTENTS
22  22
23 mem.o: mem.c 23 mem.o: mem.c
24 $(CC) $(CFLAGS) -O0 -c mem.c 24 $(CC) $(CFLAGS) -O0 -c mem.c
25@@ -54,12 +55,12 @@ makehelp: makehelp.c 25@@ -54,25 +55,25 @@
26  26
27 clean: 27 clean:
28 rm -f *.o libloc.c 28 rm -f *.o libloc.c
29- cd emacs; gmake clean 29- cd emacs; gmake clean
30+ cd emacs; $(MAKE) clean 30+ cd emacs; $(MAKE) clean
31  31
32 ship: 32 ship:
33 rm -f config.h config.cache config.log config.status 33 rm -f config.h config.cache config.log config.status
34 rm -f makefile makehelp logo *.o libloc.c 34 rm -f makefile makehelp logo *.o libloc.c
35- cd emacs; gmake ship 35- cd emacs; gmake ship
36+ cd emacs; $(MAKE) ship 36+ cd emacs; $(MAKE) ship
37  37
38 install: all 38 install: all
39 for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done 39- for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
40@@ -67,12 +68,12 @@ install: all 40- cp logo $(BINDIR)/.
41 cp -f logolib/* $(LIBLOC)/logolib/. 41- cp -f logolib/* $(LIBLOC)/logolib/.
42 cp -f helpfiles/* $(LIBLOC)/helpfiles/. 42- cp -f helpfiles/* $(LIBLOC)/helpfiles/.
43 cp -f csls/* $(LIBLOC)/csls/. 43- cp -f csls/* $(LIBLOC)/csls/.
44- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install) 44- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install)
45-# prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install 45-# prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install
 46+ for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $(DESTDIR)$$d ] || mkdir -p $(DESTDIR)$$d || exit 1; done
 47+ cp logo $(DESTDIR)$(BINDIR)/.
 48+ cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/.
 49+ cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/.
 50+ cp -f csls/* $(DESTDIR)$(LIBLOC)/csls/.
46+# (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install) 51+# (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
47+# prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install 52+# prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
48  53
49 logo-mode:  54 logo-mode:
50- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake) 55- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake)
51-# @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake 56-# @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake
52+ (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE)) 57+ (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
53+# @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) 58+# @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
54  59
55 docs: 60 docs:
56- cd emacs; gmake docs 61- cd emacs; gmake docs
57+ cd emacs; $(MAKE) docs 62+ cd emacs; $(MAKE) docs