- Move to LOCALBASE

- Pet portlint


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6625 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 342 insertions, 0 deletions

diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
new file mode 100644
index 000000000..c67b6d0c8
--- /dev/null
+++ b/graphics/passepartout/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:	passepartout
+# Date created:				11st Sep 2003
+# Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	passepartout
+PORTVERSION=	0.4
+PORTREVISION=	9
+CATEGORIES=	graphics gnome
+MASTER_SITES=	http://www.stacken.kth.se/project/pptout/files/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	DTP application for X
+
+LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
+		xml\\+\\+-1.0:${PORTSDIR}/textproc/libxml++
+RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFALGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+
+MAN1=	xml2ps.1 passepartout.1x
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-old_cxx
+.endif
+
+.if exists(${LOCALBASE}/lib/libfam.a)
+WITH_FAM=	yes
+.endif
+
+.if defined(WITH_FAM)
+LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/passepartout/distinfo b/graphics/passepartout/distinfo
new file mode 100644
index 000000000..5ff925fe0
--- /dev/null
+++ b/graphics/passepartout/distinfo
@@ -0,0 +1,3 @@
+MD5 (passepartout-0.4.tar.bz2) = 45bcf993d165daa654b6f9bce4160be2
+SHA256 (passepartout-0.4.tar.bz2) = ad04d7ec2817b3ff59a0dc053979bff2a617132884cacde019ad0eb556d7eb61
+SIZE (passepartout-0.4.tar.bz2) = 308226
diff --git a/graphics/passepartout/files/extra-patch-old_cxx b/graphics/passepartout/files/extra-patch-old_cxx
new file mode 100644
index 000000000..0c64b2007
--- /dev/null
+++ b/graphics/passepartout/files/extra-patch-old_cxx
@@ -0,0 +1,92 @@
+--- src/ps/pfb2pfa.cc.orig	Fri Oct 31 20:57:37 2003
++++ src/ps/pfb2pfa.cc	Sun Nov  2 11:47:20 2003
+@@ -4,8 +4,8 @@
+ #include "encode.h"
+ 
+ void PS::pfb2pfa(std::istream &in, std::ostream &out) {
+-  in.exceptions(std::ios_base::eofbit); // throw exception on eof
+-  try {
++//  in.exceptions(std::ios_base::eofbit); // throw exception on eof
++//  try {
+     while(in) { // parse header
+       if (in.peek() != 128)
+ 	throw std::runtime_error("bad magic number for segment");
+@@ -40,9 +40,9 @@
+ 	filter.end();
+       }
+     }
+-  } catch (std::ios_base::failure) {
+-    throw std::runtime_error("unexpected end of file");
+-  }
++//  } catch (std::ios::failure) {
++//    throw std::runtime_error("unexpected end of file");
++//  }
+ }
+ 
+ #ifdef PFB2PFA_STANDALONE
+--- src/pptout/docview.cc.orig	Sun Nov  2 11:56:40 2003
++++ src/pptout/docview.cc	Sun Nov  2 12:04:37 2003
+@@ -467,7 +467,7 @@
+ 
+ void Document_View::on_clipboard_clear() {
+   // not really necessary
+-  clip.clear(); 
++  clip.resize(0); 
+ }
+ 
+ void Document_View::cut() {
+--- src/util/filesys.h.orig	Fri Sep 19 16:46:08 2003
++++ src/util/filesys.h	Thu Dec  4 03:59:31 2003
+@@ -4,7 +4,8 @@
+ // Copyright (C) 2002, 2003, Fredrik Arnerup & Rasmus Kaj, See COPYING
+ ///
+ #include <string>
+-#include <ios>			// mode for access
++//#include <ios>			// mode for access
++#include <iostream>
+ #include <stdexcept>
+ 
+ /**
+--- src/fonts/fontmetrics.cc.orig	Thu Dec  4 04:08:47 2003
++++ src/fonts/fontmetrics.cc	Thu Dec  4 10:06:36 2003
+@@ -109,7 +109,8 @@
+       cerr << " found " << ch << "!\n";
+ #endif
+     }
+-    source.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
++//    source.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
++    source.ignore(UINT_MAX,'\n');
+   }
+ }
+ 
+--- src/util/stringutil.cc.orig	Sat Jan 17 23:00:21 2004
++++ src/util/stringutil.cc	Sat Jan 17 23:03:14 2004
+@@ -18,7 +18,7 @@
+ 
+ bool whitespace(char c)
+ {
+-  return std::isspace(c);
++  return isspace(c);
+ }
+ 
+ std::string strip_whitespace(std::string s, bool front, bool back)
+--- src/util/cmdline.cc.orig	Mon Jan 12 14:01:33 2004
++++ src/util/cmdline.cc	Sun Jan 18 00:06:17 2004
+@@ -75,7 +75,7 @@
+ 
+   // end of arguments
+   if(argi == arguments.end())
+-    return std::make_pair(null_option, "");
++    return std::make_pair(null_option, std::string());
+ 
+   // not an option
+   if(argi->at(0) != '-' || seen_double_dash || *argi == "-")
+@@ -146,7 +146,7 @@
+ 	break;
+       }
+     } else { // not REQ_PARAM
+-      arg_queue.push(std::make_pair(option->id, ""));
++      arg_queue.push(std::make_pair(option->id, std::string()));
+     }
+   }
+   argi++;
diff --git a/graphics/passepartout/files/patch-src::pptout::document::getxsltparams.cc b/graphics/passepartout/files/patch-src::pptout::document::getxsltparams.cc
new file mode 100644
index 000000000..58e84880c
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::pptout::document::getxsltparams.cc
@@ -0,0 +1,10 @@
+--- src/pptout/document/getxsltparams.cc.orig	Sun Jan 18 00:22:12 2004
++++ src/pptout/document/getxsltparams.cc	Sun Jan 18 00:22:54 2004
+@@ -3,6 +3,7 @@
+ ///
+ #include <libxml++/libxml++.h>
+ #include <fstream>
++#include <algorithm>
+ 
+ class XsltParamsFinder : public xmlpp::SaxParser {
+ public:
diff --git a/graphics/passepartout/files/patch-src::pptout::document::textstream.h b/graphics/passepartout/files/patch-src::pptout::document::textstream.h
new file mode 100644
index 000000000..522dee52f
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::pptout::document::textstream.h
@@ -0,0 +1,10 @@
+--- src/pptout/document/textstream.h.orig	Thu Dec  4 10:27:38 2003
++++ src/pptout/document/textstream.h	Thu Dec  4 10:46:07 2003
+@@ -90,6 +90,7 @@
+   std::map<const TextFrame*, unsigned int> pageno_map;
+   
+   class WorkerThread;
++  friend class WorkerThread;
+   Glib::RefPtr<WorkerThread> typesetter_thread;
+   
+   // Undefined ctors, avoid defaults
diff --git a/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h b/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h
new file mode 100644
index 000000000..7ed0624d5
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::pptout::postscriptviewent.h
@@ -0,0 +1,10 @@
+--- src/pptout/postscriptviewent.h.orig	Thu Dec  4 10:51:01 2003
++++ src/pptout/postscriptviewent.h	Thu Dec  4 10:56:37 2003
+@@ -5,6 +5,7 @@
+ ///
+ #include "viewent.h"
+ #include "document/cachedframe.h"
++#include <unistd.h>
+ 
+ class PostscriptViewent : public Viewent {
+ protected:
diff --git a/graphics/passepartout/files/patch-src::pptout::widget::dialogwrap.cc b/graphics/passepartout/files/patch-src::pptout::widget::dialogwrap.cc
new file mode 100644
index 000000000..47481c09a
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::pptout::widget::dialogwrap.cc
@@ -0,0 +1,14 @@
+--- src/pptout/widget/dialogwrap.cc.orig	Thu Aug 19 00:18:05 2004
++++ src/pptout/widget/dialogwrap.cc	Thu Aug 19 00:19:35 2004
+@@ -24,9 +24,9 @@
+   Gtk::Button *b = manage(button);
+   // Note: It seems that activate means "in any way except a simple click".
+   // So we have to add callbacks for both activate and clicked.
+-  b->signal_clicked().connect(bind(slot(*this, &Gtk::Dialog::on_response),
++  b->signal_clicked().connect(bind(slot(*this, &DialogWrap::on_response),
+ 				   action_id));
+-  b->signal_activate().connect(bind(slot(*this, &Gtk::Dialog::on_response),
++  b->signal_activate().connect(bind(slot(*this, &DialogWrap::on_response),
+ 				    action_id));
+   return b;
+ }
diff --git a/graphics/passepartout/files/patch-src::ps::pdf.cc b/graphics/passepartout/files/patch-src::ps::pdf.cc
new file mode 100644
index 000000000..165de6273
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::ps::pdf.cc
@@ -0,0 +1,16 @@
+--- src/ps/pdf.cc.orig	Wed Aug 18 23:42:10 2004
++++ src/ps/pdf.cc	Wed Aug 18 23:44:28 2004
+@@ -199,10 +199,10 @@
+     bytecount write(std::ostream *out, bool binary=true, bytecount offset=0) 
+     {
+       Part::write(out, binary, offset);
+-      std::string str(str());
++      const std::string& s(str());
+       if(out)
+-	(*out) << str;
+-      return offset+str.length();
++	(*out) << s;
++      return offset+s.length();
+     }
+ 
+   protected:
diff --git a/graphics/passepartout/files/patch-src::testbed::testbed.cc b/graphics/passepartout/files/patch-src::testbed::testbed.cc
new file mode 100644
index 000000000..30cf5b7c9
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::testbed::testbed.cc
@@ -0,0 +1,19 @@
+--- src/testbed/testbed.cc.orig	Sat Jan 17 22:58:16 2004
++++ src/testbed/testbed.cc	Sat Jan 17 22:42:18 2004
+@@ -1,6 +1,7 @@
+ #include "testbed.hh"
+ #include "util/warning.h"
+ #include <glibmm/exception.h>	// Stupid glib!
++#include <algorithm>
+ #include <functional>
+ ///
+ // Copyright (C) 2003, 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
+@@ -53,7 +54,7 @@
+     verbose.active = true;
+     verbose << "Starting test run. " << TestCase::cases.size()
+ 	    << " case(s) to try." << std::endl;
+-    for_each(TestCase::cases.begin(), TestCase::cases.end(),
++    std::for_each(TestCase::cases.begin(), TestCase::cases.end(),
+ 	     std::mem_fun(&TestCase::run));
+     verbose << "Done running " << TestCase::cases.size() << " test case(s). "
+ 	    << TestCase::successes << " succeded, "
diff --git a/graphics/passepartout/files/patch-src::util::cmdline.cc b/graphics/passepartout/files/patch-src::util::cmdline.cc
new file mode 100644
index 000000000..138d15fda
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::cmdline.cc
@@ -0,0 +1,10 @@
+--- src/util/cmdline.cc.orig	Sat Jan 17 23:49:30 2004
++++ src/util/cmdline.cc	Sat Jan 17 23:50:03 2004
+@@ -2,6 +2,7 @@
+ // Copyright (C) 2003, 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
+ ///
+ #include "cmdline.h"
++#include <algorithm>
+ 
+ CmdLine::CmdLine(int argc, char **argv) : seen_double_dash(false)
+ {
diff --git a/graphics/passepartout/files/patch-src::util::filesys.cc b/graphics/passepartout/files/patch-src::util::filesys.cc
new file mode 100644
index 000000000..d5f2ee4c7
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::filesys.cc
@@ -0,0 +1,11 @@
+--- src/util/filesys.cc.orig	Sat Jan 17 23:18:22 2004
++++ src/util/filesys.cc	Sat Jan 17 23:19:26 2004
+@@ -4,6 +4,8 @@
+ #include "filesys.h"
+ #include "stringutil.h"
+ #include "os.h"
++#include <errno.h>
++#include <memory>
+ #include <unistd.h>
+ #include <stdexcept>
+ #include "defines.h"
diff --git a/graphics/passepartout/files/patch-src::util::filesys.h b/graphics/passepartout/files/patch-src::util::filesys.h
new file mode 100644
index 000000000..a67194d77
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::filesys.h
@@ -0,0 +1,10 @@
+--- src/util/filesys.h.orig	Mon Jan 12 14:01:33 2004
++++ src/util/filesys.h	Sat Jan 17 23:40:36 2004
+@@ -6,6 +6,7 @@
+ #include <string>
+ #include <ios>			// mode for access
+ #include <stdexcept>
++#include <time.h>
+ 
+ /// An exception to use when a libc call fails and sets errno.
+ class ClibException : public std::runtime_error {
diff --git a/graphics/passepartout/files/patch-src::util::filewatcher.h b/graphics/passepartout/files/patch-src::util::filewatcher.h
new file mode 100644
index 000000000..412ff5d29
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::filewatcher.h
@@ -0,0 +1,10 @@
+--- src/util/filewatcher.h	Sat Jan 17 23:45:10 2004
++++ src/util/filewatcher.h.orig	Sat Jan 17 23:44:57 2004
+@@ -6,7 +6,8 @@
+ #include <sigc++/sigc++.h>
+ #include <string>
+ #include <memory>
++#include <time.h>
+ 
+ namespace FAM { class File; }
+ 
diff --git a/graphics/passepartout/files/patch-src::util::processman.h b/graphics/passepartout/files/patch-src::util::processman.h
new file mode 100644
index 000000000..9157b1390
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::processman.h
@@ -0,0 +1,10 @@
+--- src/util/processman.h.orig	Thu Dec  4 04:05:14 2003
++++ src/util/processman.h	Thu Dec  4 04:03:33 2003
+@@ -6,6 +6,7 @@
+ #include "refcount.h"
+ #include <map>
+ #include <string>
++#include <memory>
+ #include <sigc++/object.h>
+ #include <sys/types.h>
+ #include <gtkmm/main.h>
diff --git a/graphics/passepartout/files/patch-src::util::valueuint.h b/graphics/passepartout/files/patch-src::util::valueuint.h
new file mode 100644
index 000000000..75fd7602f
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::util::valueuint.h
@@ -0,0 +1,23 @@
+--- src/util/valueunit.h.orig	Wed Aug 18 23:48:05 2004
++++ src/util/valueunit.h	Thu Aug 19 00:04:04 2004
+@@ -15,10 +15,10 @@
+   const Value& value() const { return value_; }
+   const std::string& unit() const { return unit_; }
+   
+-private:
++protected:
+   Value value_;
+   std::string unit_;
+-  friend std::istream& operator >> <> (std::istream& in, ValueUnit<Value>& vu);
++  friend std::istream& operator >> (std::istream& in, ValueUnit<Value>& vu);
+ };
+ 
+ template <typename Tp>
+@@ -44,7 +44,6 @@
+  * Special case for float, since readig a float from "14em" barfs, guessing
+  * that the 'e' is for an exponent.
+  */
+-template<>
+ std::istream& operator >> (std::istream& in, ValueUnit<float>& vu) {
+   in >> std::ws;
+   std::string value;
diff --git a/graphics/passepartout/files/patch-src::xml2ps::pagedstream.cc b/graphics/passepartout/files/patch-src::xml2ps::pagedstream.cc
new file mode 100644
index 000000000..9f1d08d1c
--- /dev/null
+++ b/graphics/passepartout/files/patch-src::xml2ps::pagedstream.cc
@@ -0,0 +1,11 @@
+--- src/xml2ps/pagedstream.cc.orig	Thu Nov 20 04:13:54 2003
++++ src/xml2ps/pagedstream.cc	Fri Nov 21 16:32:48 2003
+@@ -7,6 +7,8 @@
+ #include <sstream>
+ #include <iostream>
+ #include <vector>
++#include <exception>
++#include <memory>
+ 
+ xml2ps::PagedStream::PagedStream() 
+   : current_part(0)
diff --git a/graphics/passepartout/pkg-descr b/graphics/passepartout/pkg-descr
new file mode 100644
index 000000000..848d42811
--- /dev/null
+++ b/graphics/passepartout/pkg-descr
@@ -0,0 +1,8 @@
+Passepartout is an Open Source Desktop Publishing application for the
+X Windows environment. The main focus is on making it easy for the
+user to create publications with a flexible layout, typical examples
+being magazines, brochures and leaflets.
+
+Questions, bug reports, etc. should be sent to emission-hacks@e.kth.se
+
+WWW: http://www.stacken.kth.se/project/pptout/
diff --git a/graphics/passepartout/pkg-plist b/graphics/passepartout/pkg-plist
new file mode 100644
index 000000000..76d035248
--- /dev/null
+++ b/graphics/passepartout/pkg-plist
@@ -0,0 +1,31 @@
+bin/passepartout
+bin/xml2ps
+%%DOCSDIR%%/README
+%%DOCSDIR%%/docbook.xslt
+%%DOCSDIR%%/examples/docbook.xslt
+%%DOCSDIR%%/examples/example1.html
+%%DOCSDIR%%/examples/example1.pp
+%%DOCSDIR%%/examples/gradient.eps
+%%DOCSDIR%%/examples/hippie.jpg
+%%DOCSDIR%%/examples/hline.eps
+%%DOCSDIR%%/examples/snowflake.eps
+%%DOCSDIR%%/examples/snowflake.xml
+%%DOCSDIR%%/examples/vline.eps
+%%DOCSDIR%%/examples/xhtml.xslt
+%%DOCSDIR%%/examples/xml2ps-example.xml
+%%DOCSDIR%%/faq.html
+%%DOCSDIR%%/faq.xml
+%%DOCSDIR%%/nsfaq.html
+%%DOCSDIR%%/nsfaq.xml
+%%DOCSDIR%%/pptout-sv.eps
+%%DOCSDIR%%/users_guide.html
+%%DOCSDIR%%/users_guide.pp
+%%DOCSDIR%%/users_guide.xml
+%%DOCSDIR%%/xhtml.xslt
+share/xml/passepartout/docbook.xslt
+share/xml/passepartout/xhtml.xslt
+share/xml/passepartout/xml2ps.dtd
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%
+@dirrm share/xml/passepartout
+@dirrmtry share/xml