PKG_DESTDIR_SUPPORT

3 files changed, 41 insertions, 26 deletions

diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index 3c116be8cf7..15a260e780e 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/20 18:15:37 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/12/17 21:56:22 abs Exp $
 #
 
 DISTNAME=	latex2rtf-1.9.16a
@@ -12,14 +12,15 @@ COMMENT=	LaTeX to RTF converter
 
 USE_TOOLS+=	perl
 MAKE_FLAGS+=	XCFLAGS=${CFLAGS:M*:Q}
-INFO_FILES=	# PLIST
+INFO_FILES=	YES # PLIST
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	share/doc/latex2rtf ${PKGINFODIR}
 
 post-install:
 	cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/latex2rtf/distinfo b/converters/latex2rtf/distinfo
index 47a4cfa9b02..09780d4a168 100644
--- a/converters/latex2rtf/distinfo
+++ b/converters/latex2rtf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/03/03 19:52:37 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2009/12/17 21:56:22 abs Exp $
 
 SHA1 (latex2rtf-1.9.16a.tar.gz) = e4f522d600b0386fa544f0fe59a7024325d0b567
 RMD160 (latex2rtf-1.9.16a.tar.gz) = 0bea62eafdbd6c240d76e3d7d6bac5cf7a14f8fe
 Size (latex2rtf-1.9.16a.tar.gz) = 633884 bytes
-SHA1 (patch-aa) = 557b35faf91536105b5093dd7f1e62e50db7b0d6
+SHA1 (patch-aa) = 5a8d2471631abc33e3e9668f96128f8b4fb02483
diff --git a/converters/latex2rtf/patches/patch-aa b/converters/latex2rtf/patches/patch-aa
index 996217710ee..a7cbb9eaf78 100644
--- a/converters/latex2rtf/patches/patch-aa
+++ b/converters/latex2rtf/patches/patch-aa
@@ -1,39 +1,53 @@
-$NetBSD: patch-aa,v 1.5 2006/03/03 19:52:37 kristerw Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/17 21:56:22 abs Exp $
 
---- Makefile.orig	2004-11-07 18:59:18.000000000 -0800
-+++ Makefile	2005-11-03 15:42:07.000000000 -0800
+--- Makefile.orig	2004-11-08 02:59:18.000000000 +0000
++++ Makefile
 @@ -2,3 +2,3 @@
  
 -CC=gcc
 +CC?=gcc
  MKDIR=mkdir -p
-@@ -18,14 +18,14 @@
- #CFLAGS:=$(CFLAGS) -Zwin32  
- 
+@@ -20,3 +20,3 @@ CFLAGS:=-DUNIX
  #Base directory - adapt as needed
 -PREFIX=$(PREFIX_DRIVE)/usr/local
 +PREFIX?=$(PREFIX_DRIVE)/usr/local
  
- #Name of executable binary --- beware of 8.3 restriction under DOS
- BINARY_NAME=latex2rtf$(EXE_SUFFIX)
- 
- # Location of binary, man, info, and support files - adapt as needed
+@@ -27,3 +27,3 @@ BINARY_NAME=latex2rtf$(EXE_SUFFIX)
  BIN_INSTALL=$(PREFIX)/bin
 -MAN_INSTALL=$(PREFIX)/man/man1
 +MAN_INSTALL=$(PREFIX)/$(PKGMANDIR)/man1
  INFO_INSTALL=$(PREFIX)/info
- SUPPORT_INSTALL=$(PREFIX)/share/latex2rtf
- CFG_INSTALL=$(PREFIX)/share/latex2rtf/cfg
-@@ -176,9 +176,9 @@
- 	cp doc/latex2rtf.1    $(MAN_INSTALL)
- 	cp doc/latex2png.1    $(MAN_INSTALL)
- 	cp $(CFGS)            $(CFG_INSTALL)
+@@ -170,13 +170,13 @@ doc: doc/latex2rtf.texi doc/Makefile
+ install: latex2rtf doc/latex2rtf.1 $(CFGS) scripts/latex2png
+-	$(MKDIR) $(BIN_INSTALL)
+-	$(MKDIR) $(MAN_INSTALL)
+-	$(MKDIR) $(CFG_INSTALL)
+-	cp $(BINARY_NAME)     $(BIN_INSTALL)
+-	cp scripts/latex2png  $(BIN_INSTALL)
+-	cp doc/latex2rtf.1    $(MAN_INSTALL)
+-	cp doc/latex2png.1    $(MAN_INSTALL)
+-	cp $(CFGS)            $(CFG_INSTALL)
 -	cp doc/latex2rtf.html $(SUPPORT_INSTALL)
 -	cp doc/latex2rtf.pdf  $(SUPPORT_INSTALL)
 -	cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
-+	cp doc/latex2rtf.html $(PREFIX)/share/doc/latex2rtf
-+	cp doc/latex2rtf.pdf  $(PREFIX)/share/doc/latex2rtf
-+#	cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
++	$(MKDIR) $(DESTDIR)$(BIN_INSTALL)
++	$(MKDIR) $(DESTDIR)$(MAN_INSTALL)
++	$(MKDIR) $(DESTDIR)$(CFG_INSTALL)
++	cp $(BINARY_NAME)     $(DESTDIR)$(BIN_INSTALL)
++	cp scripts/latex2png  $(DESTDIR)$(BIN_INSTALL)
++	cp doc/latex2rtf.1    $(DESTDIR)$(MAN_INSTALL)
++	cp doc/latex2png.1    $(DESTDIR)$(MAN_INSTALL)
++	cp $(CFGS)            $(DESTDIR)$(CFG_INSTALL)
++	cp doc/latex2rtf.html $(DESTDIR)$(PREFIX)/share/doc/latex2rtf
++	cp doc/latex2rtf.pdf  $(DESTDIR)$(PREFIX)/share/doc/latex2rtf
++#	cp doc/latex2rtf.txt  $(DESTDIR)$(SUPPORT_INSTALL)
  	@echo "******************************************************************"
- 	@echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\""
- 	@echo "*** in directory \"$(BIN_INSTALL)\""
+@@ -197,5 +197,5 @@ install: latex2rtf doc/latex2rtf.1 $(CFG
+ install-info: doc/latex2rtf.info
+-	$(MKDIR) $(INFO_INSTALL)
+-	cp doc/latex2rtf.info $(INFO_INSTALL)
+-	install-info --info-dir=$(INFO_INSTALL) doc/latex2rtf.info
++	$(MKDIR) $(DESTDIR)$(INFO_INSTALL)
++	cp doc/latex2rtf.info $(DESTDIR)$(INFO_INSTALL)
++	install-info --info-dir=$(DESTDIR)$(INFO_INSTALL) doc/latex2rtf.info
+