- Updated outdated download URLs (taken from FreeBSD's Makefile).

- Added HOMEPAGE.
- Libraries should be installed with BSD_INSTALL_LIB, not BSD_INSTALL_DATA
  (see patch-ak).
- Added support for installation to DESTDIR (Makefile, patch-ac, patch-ak,
  patch-am, patch-az).

6 files changed, 150 insertions, 51 deletions

diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 939c6898687..e4f0c69f4b9 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.47 2007/05/24 04:46:52 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2007/05/28 20:14:00 heinz Exp $
 
 DISTNAME=	urt
 PKGNAME=	urt-3.1b1
 PKGREVISION=	8
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/dept/OLD/pub/
-DISTFILES=	urt-3.1b.tar.Z urt-doc.tar urt-img.tar
+MASTER_SITES=	ftp://ftp.iastate.edu/pub/utah-raster/
+DISTFILES=	urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z
 
-PATCH_SITES=	ftp://ptolemy.berkeley.edu/pub/misc/urt/
+PATCH_SITES=	http://www.funet.fi/pub/graphics/packages/urt/rel2/
 PATCHFILES=	urt-3.1b-3.1b1.patch
 PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.cs.utah.edu/gdc/projects/urt/
 COMMENT=	Toolkit and library for raster image processing
 
 EXTRACT_ONLY=	urt-3.1b.tar.Z
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 USE_LIBTOOL=	yes
 CONFIGURE_SCRIPT=./Configure
@@ -35,11 +38,11 @@ SUBST_FILES.man=	config/urt
 SUBST_SED.man=		-e 's,^\(\#defpath MAN_DEST\).*,\1 ${PREFIX}/${PKGMANDIR},'
 
 post-install:
-	cd ${PREFIX}/share/doc/urt && \
-	    pax -r -p m -s '/doc/./' -f ${DISTDIR}/urt-doc.tar
-	cd ${PREFIX}/share/examples/urt && \
-	    pax -r -p m -f ${DISTDIR}/urt-img.tar
-	cd ${PREFIX} && \
+	cd ${DESTDIR:Q}${PREFIX:Q}/share/doc/urt && \
+	    pax -z -r -p m -s '/doc/./' -f ${DISTDIR}/urt-doc.tar.Z
+	cd ${DESTDIR:Q}${PREFIX:Q}/share/examples/urt && \
+	    pax -z -r -p m -f ${DISTDIR}/urt-img.tar.Z
+	cd ${DESTDIR:Q}${PREFIX:Q} && \
 	    chown -R ${ROOT_USER}:${ROOT_GROUP} share/doc/urt share/examples/urt && \
 	    find share/doc/urt share/examples/urt -type d -print | xargs chmod 755 && \
 	    find share/doc/urt share/examples/urt -type f -print | xargs chmod 444
diff --git a/graphics/urt/distinfo b/graphics/urt/distinfo
index c4c26a3ef3b..e3c4800bc86 100644
--- a/graphics/urt/distinfo
+++ b/graphics/urt/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.8 2007/05/24 04:46:15 rillig Exp $
+$NetBSD: distinfo,v 1.9 2007/05/28 20:14:00 heinz Exp $
 
-SHA1 (urt-3.1b.tar.Z) = 370b19c9e7019a7258754e7494b7ae2d7fe138ac
-RMD160 (urt-3.1b.tar.Z) = fd99f3a4ec7cb6c9195752e227ad95428e331bba
-Size (urt-3.1b.tar.Z) = 1016405 bytes
-SHA1 (urt-doc.tar) = d5ffb511309c95ea75937c3c779e7a4d3b1d60f3
-RMD160 (urt-doc.tar) = 19b855cc5497b129be78c5235f3a78bc80b51888
-Size (urt-doc.tar) = 548864 bytes
-SHA1 (urt-img.tar) = 0bdca907616ccee15ae1915af40fb370a705954f
-RMD160 (urt-img.tar) = c84766707fd033b38703f858cd27312ccc4a2d1a
-Size (urt-img.tar) = 1851392 bytes
 SHA1 (urt-3.1b-3.1b1.patch) = 27aefd80b480af298fe4f9542a2efbddba8a174b
 RMD160 (urt-3.1b-3.1b1.patch) = 1eca13b44326f632c98312d364434d785751609a
 Size (urt-3.1b-3.1b1.patch) = 18264 bytes
+SHA1 (urt-3.1b.tar.Z) = 370b19c9e7019a7258754e7494b7ae2d7fe138ac
+RMD160 (urt-3.1b.tar.Z) = fd99f3a4ec7cb6c9195752e227ad95428e331bba
+Size (urt-3.1b.tar.Z) = 1016405 bytes
+SHA1 (urt-doc.tar.Z) = 1778255cc688693c3dff1f679386692b665733f5
+RMD160 (urt-doc.tar.Z) = b68100c8837e7464bd2db3eecd3039c7515ab371
+Size (urt-doc.tar.Z) = 491431 bytes
+SHA1 (urt-img.tar.Z) = 3ffa59524037196461c16180c45261e1b4f8ac57
+RMD160 (urt-img.tar.Z) = 22c7bf9ea1cf1d9d2441dc85901b6e90f07cc34d
+Size (urt-img.tar.Z) = 1740307 bytes
 SHA1 (patch-aa) = f7be02075737fc19750c07c04cfa444e0baf020b
 SHA1 (patch-ab) = 8f8e50f6ccdd80afaa034af998e47284e7788398
-SHA1 (patch-ac) = 5b4d6c910f282e1cb16fd29c7956b40a335491b1
+SHA1 (patch-ac) = bf78a3eaea78c1e38327e8534fa84f8e5ea5b5bd
 SHA1 (patch-ad) = 764806da7b3b4798ef2627df376db8dcc7c5e97f
 SHA1 (patch-ae) = f6bd6f34fa3b06a003d9daf563fefc14aab1a096
 SHA1 (patch-af) = ef433d729a4c087eb9ff1474e393064701295b66
@@ -22,9 +22,9 @@ SHA1 (patch-ag) = 2017d46b8bf8281446cb092841f26753020d87f6
 SHA1 (patch-ah) = e7c89cc45258b40586843c83973e80a9ece34674
 SHA1 (patch-ai) = 27ae6c03df5a13bfcf3e56e64f0f1278cdaef5e8
 SHA1 (patch-aj) = a3207a60ceacb7deedab1dc96efb8b4c452fea26
-SHA1 (patch-ak) = feb3d08f99cfef4df7c0bfd9b8794b540af11469
+SHA1 (patch-ak) = e4efa3d7843e4258c735428361835001a5eb4fed
 SHA1 (patch-al) = f3bb1c6a8d2f0189014d004146d2612e39ad55f9
-SHA1 (patch-am) = cc9a4db1a95257da41f66b14c39fabfe9618fcb2
+SHA1 (patch-am) = 4a2b0eee94c7fdef5c93595818f3f41674a82771
 SHA1 (patch-an) = ee6bf051757137448a5d1a002f03fa608900e430
 SHA1 (patch-ao) = 02080e1cc86651bbad9649d703c7f9c9dd9e203a
 SHA1 (patch-ap) = f9b5f52952599f156447840ebb325d13c1b93663
@@ -37,3 +37,4 @@ SHA1 (patch-av) = 62ebce67399111a7a6405d3e639d402273c00d23
 SHA1 (patch-aw) = f9d76a52d6efe3e08099c920e4cd4f9941275eae
 SHA1 (patch-ax) = 17b1791381652a4b18f68090694f72c487fc47ec
 SHA1 (patch-ay) = 234fb76c5ce9081684613a1c2e6f211df65ca539
+SHA1 (patch-az) = e29f216770a8f63eb4515ad9b2b244aa2f59407e
diff --git a/graphics/urt/patches/patch-ac b/graphics/urt/patches/patch-ac
index 1c0bf97ee6d..46966395451 100644
--- a/graphics/urt/patches/patch-ac
+++ b/graphics/urt/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.3 2000/11/08 21:57:20 tron Exp $
+$NetBSD: patch-ac,v 1.4 2007/05/28 20:14:00 heinz Exp $
 
 Extensive hacking around - instead of installing manual pages which
 simply source other man pages, make a symbolic link to the target.
 
---- man/makefile.src.orig	Thu Feb 27 21:26:52 1992
-+++ man/makefile.src	Mon Aug 24 17:42:59 1998
-@@ -197,11 +197,9 @@
+--- man/makefile.src.orig	1992-02-27 22:26:52.000000000 +0100
++++ man/makefile.src
+@@ -197,11 +197,9 @@ PAGE3_INSTALL_NAME = \`basename \$$i\`
  GET_SETUP_OK_PAGE3 = man3/rle_get_setup_ok.3
  #endif
  
@@ -19,7 +19,7 @@ simply source other man pages, make a symbolic link to the target.
  
  # Default action is to print all man pages
  all:
-@@ -211,7 +209,6 @@
+@@ -211,55 +209,72 @@ all:
  
  # Put the manual pages into a global location
  install: install-1 install-3 install-5
@@ -27,7 +27,13 @@ simply source other man pages, make a symbolic link to the target.
  
  install-1: $(PAGES1)
  	@-sh -c "if test '$(DEST)X' != X ; then \
-@@ -223,11 +220,10 @@
+ 		for i in $? ; do \
+ 			dpgm=\`basename \$$i .1\`.$(SUFF1) ; \
+-			echo cp \$$i $(DEST1)/\$$dpgm ; \
+-			cp \$$i $(DEST1)/\$$dpgm ; \
++			echo cp \$$i $(DESTDIR)$(DEST1)/\$$dpgm ; \
++			cp \$$i $(DESTDIR)$(DEST1)/\$$dpgm ; \
+ 		done ; \
  	else \
  		true ; \
  	fi"
@@ -39,9 +45,11 @@ simply source other man pages, make a symbolic link to the target.
 -		for i in $? ; do \
 +		for i in ${MANPAGES3} ; do \
  			dpgm=${PAGE3_INSTALL_NAME} ; \
- 			echo cp \$$i $(DEST3)/\$$dpgm ; \
- 			cp \$$i $(DEST3)/\$$dpgm ; \
-@@ -235,15 +231,34 @@
+-			echo cp \$$i $(DEST3)/\$$dpgm ; \
+-			cp \$$i $(DEST3)/\$$dpgm ; \
++			echo cp \$$i $(DESTDIR)$(DEST3)/\$$dpgm ; \
++			cp \$$i $(DESTDIR)$(DEST3)/\$$dpgm ; \
+ 		done ; \
  	else \
  		true ; \
  	fi"
@@ -52,8 +60,8 @@ simply source other man pages, make a symbolic link to the target.
 +	@for i in ${SOPAGES3}; do \
 +		dpgm=`echo $$i | sed -e 's|.*/||'` ; \
 +		tgt=`awk '/^\.so/ { print \$$2; exit}' < \$$i`; \
-+		echo "ln -fs ../$$tgt ${DEST3}/$$dpgm"; \
-+		ln -fs ../$$tgt ${DEST3}/$$dpgm; \
++		echo "ln -fs ../$$tgt $(DESTDIR)${DEST3}/$$dpgm"; \
++		ln -fs ../$$tgt $(DESTDIR)${DEST3}/$$dpgm; \
 +	done
 +
 +install-5: ${MANPAGES5} 5links
@@ -62,8 +70,8 @@ simply source other man pages, make a symbolic link to the target.
 -		cp $? $(DEST5); \
 +		for i in ${MANPAGES5} ; do \
 +			dpgm=${PAGE3_INSTALL_NAME} ; \
-+			echo cp \$$i $(DEST5)/\$$dpgm; \
-+			cp \$$i $(DEST5)/\$$dpgm; \
++			echo cp \$$i $(DESTDIR)$(DEST5)/\$$dpgm; \
++			cp \$$i $(DESTDIR)$(DEST5)/\$$dpgm; \
 +		done; \
  	else true; \
  	fi"
@@ -73,11 +81,33 @@ simply source other man pages, make a symbolic link to the target.
 +	@for i in ${SOPAGES5}; do \
 +		dpgm=`echo $$i | sed -e 's|.*/||'` ; \
 +		tgt=`awk '/^\.so/ { print \$$2; exit}' < \$$i`; \
-+		echo "ln -fs ../$$tgt ${DEST5}/$$dpgm"; \
-+		ln -fs ../$$tgt ${DEST5}/$$dpgm; \
++		echo "ln -fs ../$$tgt $(DESTDIR)${DEST5}/$$dpgm"; \
++		ln -fs ../$$tgt $(DESTDIR)${DEST5}/$$dpgm; \
 +	done
 +
 +
  
  # Clean up installed man pages
  pristine:
+ 	-rm -f install*
+ 	@-if test $(DEST)X != X ; then \
+ 	    for i in man1/*.1 ; do \
+-		echo "rm -f $(DEST1)/`basename $$i .1`.$(SUFF1)" ;\
+-		rm -f $(DEST1)/`basename $$i .1`.$(SUFF1) ;\
++		echo "rm -f $(DESTDIR)$(DEST1)/`basename $$i .1`.$(SUFF1)" ;\
++		rm -f $(DESTDIR)$(DEST1)/`basename $$i .1`.$(SUFF1) ;\
+ 	    done ; \
+ 	    for i in $(PAGES3) ; do \
+-		eval "echo rm -f $(DEST3)/${PAGE3_INSTALL_NAME}" ; \
+-		eval "rm -f $(DEST3)/${PAGE3_INSTALL_NAME}" ; \
++		eval "echo rm -f $(DESTDIR)$(DEST3)/${PAGE3_INSTALL_NAME}" ; \
++		eval "rm -f $(DESTDIR)$(DEST3)/${PAGE3_INSTALL_NAME}" ; \
+ 	    done ; \
+ 	    for i in man5/*.5 ; do \
+-		echo rm -f $(DEST5)/$$i ; \
+-		rm -f $(DEST5)/$$i ; \
++		echo rm -f $(DESTDIR)$(DEST5)/$$i ; \
++		rm -f $(DESTDIR)$(DEST5)/$$i ; \
+ 	    done ; \
+ 	else \
+ 	    true ;\
diff --git a/graphics/urt/patches/patch-ak b/graphics/urt/patches/patch-ak
index 53d91b0ebff..03f9e202729 100644
--- a/graphics/urt/patches/patch-ak
+++ b/graphics/urt/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2001/03/02 16:52:29 skrll Exp $
+$NetBSD: patch-ak,v 1.5 2007/05/28 20:14:00 heinz Exp $
 
---- lib/makefile.src.orig	Wed Mar  4 19:32:53 1992
+--- lib/makefile.src.orig	1992-03-04 20:32:53.000000000 +0100
 +++ lib/makefile.src
-@@ -26,6 +26,9 @@
+@@ -26,6 +26,9 @@ OBJS = Runput.o buildmap.o cmd_name.o co
  	vaxshort.o \
  	$(OPT_OBJS)
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ak,v 1.4 2001/03/02 16:52:29 skrll Exp $
  LIBNAME = librle.a
  
  # Just rebuild the object files.
-@@ -36,40 +39,13 @@
+@@ -36,40 +39,13 @@ objs: $(OBJS)
  #  is more useful to have a non-debug version than nothing at all.)
  # Do nothing if $(DEST) is empty (or not defined)
  install: buildlib
@@ -40,7 +40,7 @@ $NetBSD: patch-ak,v 1.4 2001/03/02 16:52:29 skrll Exp $
 -	else \
 -		true ; \
 -	fi"
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBNAME:.a=.la} ${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIBNAME:.a=.la} ${DESTDIR}${PREFIX}/lib
  	touch install
  
  # Rebuild the library from all the .o files.
@@ -51,7 +51,7 @@ $NetBSD: patch-ak,v 1.4 2001/03/02 16:52:29 skrll Exp $
 -#ifndef NO_RANLIB
 -	ranlib $(LIBNAME)
 -#endif
-+	${LIBTOOL} --mode=link ${CC} -o ${LIBNAME:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
++	${LIBTOOL} --mode=link ${CC} -o ${LIBNAME:.a=.la} ${OBJS:.o=.lo} -rpath ${DESTDIR}${PREFIX}/lib -version-info 1:0
  	touch buildlib
  
  # Clean up installed stuff and binaries
diff --git a/graphics/urt/patches/patch-am b/graphics/urt/patches/patch-am
index 95a14068051..a2df3a24162 100644
--- a/graphics/urt/patches/patch-am
+++ b/graphics/urt/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2001/03/26 22:51:39 skrll Exp $
+$NetBSD: patch-am,v 1.3 2007/05/28 20:14:00 heinz Exp $
 
---- makefile.tlr.orig	Tue Aug  4 18:17:57 1992
+--- makefile.tlr.orig	1992-08-04 19:17:57.000000000 +0200
 +++ makefile.tlr
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ subdirs:
  	@sh -c "if test 'x$(DIRS)' != x ; then eval \
  		'set -e ; for dir in $(DIRS) ; do \
  			(cd \$$dir ; echo Make ${HERE}\$$dir ; \
@@ -11,17 +11,32 @@ $NetBSD: patch-am,v 1.2 2001/03/26 22:51:39 skrll Exp $
  		done' ; \
  	  else \
  		true ; \
-@@ -18,8 +18,7 @@
+@@ -18,8 +18,7 @@ install-pgm: $(PGMS)
  	@sh -c "if test 'x$?' != x ; then eval \
  		'for pgm in $? ; do \
  			dpgm=\`basename \$$pgm .out\` ; \
 -			echo cp \$$pgm $(DEST)/\$$dpgm ; \
 -			cp \$$pgm $(DEST)/\$$dpgm; \
-+			${LIBTOOL} --mode=install cp \$$pgm $(DEST)/\$$dpgm; \
++			${LIBTOOL} --mode=install cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm; \
  		done' ; \
  	else \
  	    true ; \
-@@ -46,7 +45,7 @@
+@@ -31,10 +30,10 @@ install-script: $(SCRIPTS)
+ 	@sh -c "if test 'x$?' != x ; then eval \
+ 		'for pgm in $? ; do \
+ 			dpgm=\`basename \$$pgm .sh\` ; \
+-			echo cp \$$pgm $(DEST)/\$$dpgm ; \
+-			cp \$$pgm $(DEST)/\$$dpgm; \
+-			echo chmod a+rx $(DEST)/\$$dpgm ; \
+-			chmod a+rx $(DEST)/\$$dpgm; \
++			echo cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm ; \
++			cp \$$pgm $(DESTDIR)$(DEST)/\$$dpgm; \
++			echo chmod a+rx $(DESTDIR)$(DEST)/\$$dpgm ; \
++			chmod a+rx $(DESTDIR)$(DEST)/\$$dpgm; \
+ 		done' ; \
+ 	else \
+ 	    true ; \
+@@ -46,7 +45,7 @@ install-subdirs: subdirs
  	@sh -c "if test 'x$(DIRS)' != x  ; then eval \
  		'for dir in $(DIRS) ; do \
  			(cd \$$dir ; echo Install ${HERE}\$$dir ; \
@@ -30,7 +45,29 @@ $NetBSD: patch-am,v 1.2 2001/03/26 22:51:39 skrll Exp $
  		done' ; \
  	  else \
  		true ; \
-@@ -105,7 +104,7 @@
+@@ -86,8 +85,8 @@ pristine-pgm: clean-pgm
+ 	@-if test 'x$(PGMS)' != x ; then eval \
+ 		'for pgm in $(PGMS); do \
+ 			dpgm=`basename $$pgm .out`; \
+-			echo rm -f $(DEST)/$$dpgm; \
+-			rm -f $(DEST)/$$dpgm; \
++			echo rm -f $(DESTDIR)$(DEST)/$$dpgm; \
++			rm -f $(DESTDIR)$(DEST)/$$dpgm; \
+ 		done' ; \
+ 	else \
+ 	    true ; \
+@@ -95,8 +94,8 @@ pristine-pgm: clean-pgm
+ 	@-if test 'x$(SCRIPTS)' != x ; then eval \
+ 		'for pgm in $(SCRIPTS); do \
+ 			dpgm=`basename $$pgm .sh`; \
+-			echo rm -f $(DEST)/$$dpgm; \
+-			rm -f $(DEST)/$$dpgm; \
++			echo rm -f $(DESTDIR)$(DEST)/$$dpgm; \
++			rm -f $(DESTDIR)$(DEST)/$$dpgm; \
+ 		done' ; \
+ 	else \
+ 	    true ; \
+@@ -105,7 +104,7 @@ pristine-pgm: clean-pgm
  	    'for dir in $(ALLDIRS); do \
  		if test -d $$dir ; then \
  			(cd $$dir; echo Make ${HERE}$$dir pristine ; \
@@ -39,7 +76,7 @@ $NetBSD: patch-am,v 1.2 2001/03/26 22:51:39 skrll Exp $
  		else \
  			true; \
  		fi; \
-@@ -124,7 +123,7 @@
+@@ -124,7 +123,7 @@ clean-pgm:
  	    'for dir in $(ALLDIRS); do \
  		if test -d $$dir ; then \
  			(cd $$dir; echo Clean ${HERE}$$dir ; \
diff --git a/graphics/urt/patches/patch-az b/graphics/urt/patches/patch-az
new file mode 100644
index 00000000000..008b8ef4a0f
--- /dev/null
+++ b/graphics/urt/patches/patch-az
@@ -0,0 +1,28 @@
+$NetBSD: patch-az,v 1.1 2007/05/28 20:14:00 heinz Exp $
+
+  Prepend DESTDIR for staged installation.
+
+--- include/makefile.src.orig	1991-06-07 17:56:22.000000000 +0200
++++ include/makefile.src
+@@ -35,8 +35,8 @@ install: $(HDRS)
+ 	@sh -c "if test 'x$(DEST)' != x ; then \
+ 		if test 'x$(HDRS)' != x ; then eval \
+ 			'for hdr in $?; do \
+-				echo cp \$$hdr $(DEST)/\$$hdr ; \
+-				cp \$$hdr $(DEST)/\$$hdr; \
++				echo cp \$$hdr $(DESTDIR)$(DEST)/\$$hdr ; \
++				cp \$$hdr $(DESTDIR)$(DEST)/\$$hdr; \
+ 			done' ; \
+ 		else \
+ 		    true ; \
+@@ -54,8 +54,8 @@ clean:
+ pristine:
+ 	@-if test "x$(DEST)" != x ; then eval \
+ 		'for hdr in $(HDRS); do \
+-			echo rm -f $(DEST)/$$hdr; \
+-			rm -f $(DEST)/$$hdr; \
++			echo rm -f $(DESTDIR)$(DEST)/$$hdr; \
++			rm -f $(DESTDIR)$(DEST)/$$hdr; \
+ 		done' ; \
+ 	else \
+ 		true ; \