DESTDIR support

4 files changed, 99 insertions, 7 deletions

diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index cfad53170ce..7899add7d1d 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/20 00:58:07 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/02/01 02:19:35 joerg Exp $
 #
 
 DISTNAME=	verilog-0.8.7
@@ -11,6 +11,7 @@ HOMEPAGE=	http://icarus.com/eda/verilog/index.html
 COMMENT=	Verilog simulation and synthesis tool (stable release version)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	verilog-current-[0-9]*
 
@@ -21,6 +22,8 @@ USE_TOOLS+=		gmake bison lex
 CONFIGURE_ARGS+=	--without-ipal
 TEST_TARGET=		check
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
diff --git a/cad/verilog/distinfo b/cad/verilog/distinfo
index 0c233d23eb2..1b7a2862c14 100644
--- a/cad/verilog/distinfo
+++ b/cad/verilog/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2009/10/08 16:52:04 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2010/02/01 02:19:35 joerg Exp $
 
 SHA1 (verilog-0.8.7.tar.gz) = 814f12a99463a637cb13e0d86755f762c5d90270
 RMD160 (verilog-0.8.7.tar.gz) = 63fb4f9e1e85157010d480e5d66513d6c9ac4326
 Size (verilog-0.8.7.tar.gz) = 1273972 bytes
 SHA1 (patch-aa) = c109856bb5ff121bf70856a5a13678e2c7b68f80
-SHA1 (patch-ad) = 41628d48a697499e71471defccb596426a098da7
+SHA1 (patch-ab) = a24f627af270c848e84ecbfe63053daebb1ec37d
+SHA1 (patch-ad) = 334c20f008ca509e63553f36aaed70fe002c75cf
diff --git a/cad/verilog/patches/patch-ab b/cad/verilog/patches/patch-ab
new file mode 100644
index 00000000000..eed2d0e4991
--- /dev/null
+++ b/cad/verilog/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.9 2010/02/01 02:19:35 joerg Exp $
+
+--- tgt-vvp/Makefile.in.orig	2010-02-01 02:14:50.000000000 +0000
++++ tgt-vvp/Makefile.in
+@@ -87,20 +87,20 @@ check: all
+ install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ 
+ $(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
+-	$(INSTALL_PROGRAM) ./vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt
++	$(INSTALL_PROGRAM) ./vvp.tgt $(libdir)/ivl$(suffix)/vvp.tgt
+ 
+ $(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
+-	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf
++	$(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp.conf
+ 
+ $(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
+-	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
++	$(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp-s.conf
+ 
+ 
+ installdirs: ../mkinstalldirs
+-	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
++	$(srcdir)/../mkinstalldirs $(libdir)/ivl$(suffix)
+ 
+ uninstall:
+-	rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
++	rm -f $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ 
+ 
+ -include $(patsubst %.o, dep/%.d, $O)
diff --git a/cad/verilog/patches/patch-ad b/cad/verilog/patches/patch-ad
index 1de31dfa409..359bc71dd81 100644
--- a/cad/verilog/patches/patch-ad
+++ b/cad/verilog/patches/patch-ad
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.8 2006/10/04 23:52:48 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.9 2010/02/01 02:19:35 joerg Exp $
 
---- Makefile.in.orig	2006-10-04 17:08:59.000000000 +0000
-+++ Makefile.in	2006-10-04 22:39:41.000000000 +0000
-@@ -171,6 +171,17 @@
+--- Makefile.in.orig	2008-12-10 03:21:48.000000000 +0000
++++ Makefile.in
+@@ -176,8 +176,19 @@ dep:
+ 
  lexor.o: lexor.cc parse.h
  
 -parse.o: parse.cc
@@ -21,3 +22,60 @@ $NetBSD: patch-ad,v 1.8 2006/10/04 23:52:48 dmcmahill Exp $
 + 
  parse.cc parse.h: $(srcdir)/parse.y
  	$(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
+ 	mv parse.cc.h parse.h 2>/dev/null || mv parse.hh parse.h
+@@ -233,10 +244,10 @@ install: all installdirs $(libdir)/ivl$(
+ 	    do (cd $$dir ; $(MAKE) $@); done
+ 
+ $(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
+-	$(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi$(suffix)
++	$(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi$(suffix)
+ 
+ $(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
+-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@
++	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl$(suffix)/ivl@EXEEXT@
+ 
+ $(libdir)/ivl$(suffix)/xnf-s.conf: $(srcdir)/xnf-s.conf
+ 	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl$(suffix)/xnf-s.conf
+@@ -260,15 +271,15 @@ $(includedir)/veriuser.h: $(srcdir)/veri
+ 	$(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h
+ 
+ $(mandir)/man1/iverilog-vpi$(suffix).1: $(srcdir)/iverilog-vpi.man
+-	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1
++	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi$(suffix).1
+ 
+ $(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
+-	$(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
++	$(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi$(suffix).pdf
+ 
+ 
+ installdirs: mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
+-	    $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
++	$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl$(suffix) \
++	    $(libdir)/ivl$(suffix)/include $(mandir) $(mandir)/man1
+ 
+ uninstall:
+ 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+@@ -276,15 +287,15 @@ uninstall:
+ 	for dir in vpi ivlpp driver; \
+ 	    do (cd $$dir ; $(MAKE) $@); done
+ 	for f in xnf.conf xnf-s.conf ivl@EXEEXT@; \
+-	    do rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/$$f; done
+-	-rmdir $(DESTDIR)$(libdir)/ivl$(suffix)/include
+-	-rmdir $(DESTDIR)$(libdir)/ivl$(suffix)
++	    do rm -f $(libdir)/ivl$(suffix)/$$f; done
++	-rmdir $(libdir)/ivl$(suffix)/include
++	-rmdir $(libdir)/ivl$(suffix)
+ 	for f in verilog$(suffix) iverilog-vpi$(suffix); \
+-	    do rm -f $(DESTDIR)$(bindir)/$$f; done
++	    do rm -f $(bindir)/$$f; done
+ 	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
+-	    do rm -f $(DESTDIR)$(includedir)/$$f; done
+-	-test X$(suffix) = X || rmdir $(DESTDIR)/$(includedir)
+-	rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1 $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
++	    do rm -f $(includedir)/$$f; done
++	-test X$(suffix) = X || rmdir /$(includedir)
++	rm -f $(mandir)/man1/iverilog-vpi$(suffix).1 $(prefix)/iverilog-vpi$(suffix).pdf
+ 
+ 
+ -include $(patsubst %.o, dep/%.d, $O)