Import of pkgsrc-2013Q2

textproc/catdoc/patches/patch-Makefile.in

@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/06/16 09:08:52 ryoon Exp $
+
+* Install mn pages in doc directory.
+
+--- Makefile.in.orig	2012-12-03 17:59:19.000000000 +0000
++++ Makefile.in
+@@ -9,9 +9,10 @@ all:
+ 	done
+ 
+ install:
+-	for i in src doc charsets desktop; do\
++	for i in src charsets desktop; do\
+ 	   (cd $$i; $(MAKE) install);\
+ 	done
++	cd doc && ${MAKE} install-catdoc
+ clean:
+ 	for i in src doc charsets desktop; do\
+ 	   (cd $$i; $(MAKE) clean);\

textproc/catdoc/patches/patch-ac

@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.7 2013/06/16 09:08:52 ryoon Exp $
+
+--- src/Makefile.in.orig	2012-12-03 17:59:19.000000000 +0000
++++ src/Makefile.in
+@@ -74,12 +74,12 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
+ #	$(CC) -c $(CFLAGS) $*
+ all: @buildtargets@
+ catdoc: $(OBJ)
+-	$(CC)  -o catdoc  $(OBJ)
++	$(CC)  -o catdoc  $(OBJ) ${LIBS}
+ xls2csv: $(OBJXLS)
+-	$(CC) -o xls2csv $(OBJXLS) -lm
++	$(CC) -o xls2csv $(OBJXLS) -lm ${LIBS}
+ 
+ catppt: $(OBJPPT)
+-	$(CC) -o catppt $(OBJPPT) -lm
++	$(CC) -o catppt $(OBJPPT) -lm ${LIBS}
+ 
+ install: @installtargets@
+ install-catdoc:catdoc xls2csv catppt 

textproc/catdoc/patches/patch-desktop_Makefile.in

@@ -0,0 +1,22 @@
+$NetBSD: patch-desktop_Makefile.in,v 1.1 2013/06/16 09:08:52 ryoon Exp $
+
+* Create target directory with standard way.
+* DESTDIR support.
+
+--- desktop/Makefile.in.orig	2012-12-03 17:59:19.000000000 +0000
++++ desktop/Makefile.in
+@@ -20,10 +20,10 @@ all:
+ clean:
+ 
+ install: all
+-	../mkinstalldirs $(prefix)$(desktopdir)
+-	../mkinstalldirs $(prefix)$(iconsdir)
+-	$(INSTALL) -m 644 wordview.desktop $(prefix)$(desktopdir)/wordview.desktop
+-	$(INSTALL) -m 644 wordview.xpm $(prefix)$(iconsdir)/wordview.xpm
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(prefix)$(desktopdir)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(prefix)$(iconsdir)
++	${BSD_INSTALL_DATA} wordview.desktop ${DESTDIR}$(prefix)$(desktopdir)/wordview.desktop
++	${BSD_INSTALL_DATA} wordview.xpm ${DESTDIR}$(prefix)$(iconsdir)/wordview.xpm
+ 
+ distclean: clean
+ 	rm Makefile

textproc/catdoc/patches/patch-doc_Makefile.in

@@ -0,0 +1,29 @@
+$NetBSD: patch-doc_Makefile.in,v 1.1 2013/06/16 09:08:52 ryoon Exp $
+
+* Enable man page installation.
+
+--- doc/Makefile.in.orig	2012-12-03 17:59:19.000000000 +0000
++++ doc/Makefile.in
+@@ -24,14 +24,14 @@ dosdoc: catdoc.txt catdoc.ps xls2csv.txt
+ clean:
+ 	rm build
+ #install: @installtargets@
+-#install-catdoc: catdoc.1 xls2csv.1 catppt.1
+-#	../mkinstalldirs $(installroot)$(mandir)
+-#	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/catdoc$(manext)
+-#	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/xls2csv$(manext)
+-#	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/catppt$(manext)
+-#install-wordview:	
+-#	../mkinstalldirs $(installroot)$(mandir)
+-#	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/wordview$(manext)
++install-catdoc: catdoc.1 xls2csv.1 catppt.1
++	${BSD_INSTALL_MAN_DIR} $(installroot)$(mandir)
++	${BSD_INSTALL_MAN} catdoc.1 $(installroot)$(mandir)/catdoc$(manext)
++	${BSD_INSTALL_MAN} xls2csv.1 $(installroot)$(mandir)/xls2csv$(manext)
++	${BSD_INSTALL_MAN} catppt.1 $(installroot)$(mandir)/catppt$(manext)
++install-wordview:	
++	${BSD_INSTALL_MAN_DIR} $(installroot)$(mandir)
++	${BSD_INSTALL_MAN} wordview.1 $(installroot)$(mandir)/wordview$(manext)
+ # Following rules are primarily for developers use. I doubt that you
+ # need to rebuild these versions of documentation
+ distclean: catppt.txt catppt.ps catdoc.1 catdoc.txt catdoc.ps xls2csv.1  xls2csv.txt xls2csv.ps