Update to 1.3.3.4, with some patches

o.k. from mbalmer (also new maintainer).

print/scribus/Makefile

@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2006/09/18 11:59:59 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2006/10/20 22:52:47 kili Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"DTP program"
-DISTNAME=	scribus-1.2.2.1
-PKGNAME=	${DISTNAME}p3
+DISTNAME=	scribus-1.3.3.4
 CATEGORIES=	print
 
-HOMEPAGE=	http://www.scribus.org.uk/
+HOMEPAGE=	http://www.scribus.net/
+
+MAINTAINER=	Marc Balmer <mbalmer@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM?=	Yes
@@ -16,13 +17,13 @@ PERMIT_DISTFILES_CDROM?=Yes
 PERMIT_DISTFILES_FTP?=	Yes
 
 WANTLIB=	ICE SM X11 Xext c freetype gcrypt gnutls gpg-error \
-		m pthread stdc++ z
+		m pthread stdc++ z util fontconfig
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scribus/}
 
 EXTRACT_SUFX=	.tar.bz2
 
-MODULES=	x11/qt3 devel/gettext
+MODULES=	x11/qt3 devel/gettext lang/python
 MODQT_MT=	Yes
 
 LIB_DEPENDS=	jpeg::graphics/jpeg \
@@ -30,7 +31,7 @@ LIB_DEPENDS=	jpeg::graphics/jpeg \
 		art_lgpl_2::graphics/libart \
 		png::graphics/png \
 		tiff::graphics/tiff \
-		python2.4:python-2.4.*:lang/python/2.4 \
+		python${MODPY_VERSION}:python-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION} \
 		cups::print/cups \
 		xml2::textproc/libxml
 
@@ -38,7 +39,6 @@ USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 
 CONFIGURE_STYLE=gnu
-#AUTOCONF_VERSION=	2.59
 CONFIGURE_ARGS=	${MODQT_CONFIGURE_ARGS} \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
@@ -59,9 +59,15 @@ CXXFLAGS+=-g
 PLUGINS=about charselect csvim fontpreview htmlim importps \
 	newfromtemplateplugin odtimplugin oodrawimp pdf postscript preferences \
 	preview saveastemplateplugin scribusexportpixmap scribusshortwords \
-	scriptplugin svgexplugin svgimplugin sxwimplugin textfilterplugin txtim 
+	scriptplugin svgexplugin svgimplugin sxwimplugin textfilterplugin \
+	txtim barcodegenerator colorwheel docim oldscribusformat pdbim
 .for _n in ${PLUGINS}
 MAKE_FLAGS+=	lib${_n}_la_LDFLAGS='-module -avoid-version'
 .endfor
 
+post-install:
+	rm -rf ${WRKINST}/usr/local/share/doc/scribus
+	mv ${WRKINST}/usr/local/share/doc/${DISTNAME} \
+	    ${WRKINST}/usr/local/share/doc/scribus
+
 .include <bsd.port.mk>

print/scribus/distinfo

@@ -1,4 +1,4 @@
-MD5 (scribus-1.2.2.1.tar.bz2) = 8c2eac0a358b04c39252586d9d85ab24
-RMD160 (scribus-1.2.2.1.tar.bz2) = c3193cfcfac65079dc674615f0ef30a2fe7aa7df
-SHA1 (scribus-1.2.2.1.tar.bz2) = 89dff737856d2d73068d0715fa27aad96262e1a4
-SIZE (scribus-1.2.2.1.tar.bz2) = 7718632
+MD5 (scribus-1.3.3.4.tar.bz2) = ccd7fb34a77b7e3d83e902fb3f5b731b
+RMD160 (scribus-1.3.3.4.tar.bz2) = 71f1313299d0f38083fb3909773c643539f93f9e
+SHA1 (scribus-1.3.3.4.tar.bz2) = e8fb443035125e9db604202991f65729998c7538
+SIZE (scribus-1.3.3.4.tar.bz2) = 11505553

print/scribus/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2005/09/04 23:48:35 espie Exp $
---- configure.orig	Tue Jul  5 15:14:21 2005
-+++ configure	Sun Aug 28 13:43:28 2005
-@@ -4969,7 +4969,7 @@ if test "${ac_cv_lib_tiff_TIFFOpen+set}"
+$OpenBSD: patch-configure,v 1.3 2006/10/20 22:52:47 kili Exp $
+--- configure.orig	Tue Oct  3 01:07:51 2006
++++ configure	Sun Oct 15 13:46:10 2006
+@@ -6039,7 +6039,7 @@ if test "${ac_cv_lib_tiff_TIFFOpen+set}"
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -10,3 +10,28 @@ $OpenBSD: patch-configure,v 1.2 2005/09/04 23:48:35 espie Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -34119,10 +34119,10 @@ else
+ 	GS_VER_MINOR=`gs --version | cut -d . -f 2`
+ 	echo "$as_me:$LINENO: result: ${GS_VER_MAJOR}.${GS_VER_MINOR}" >&5
+ echo "${ECHO_T}${GS_VER_MAJOR}.${GS_VER_MINOR}" >&6
+-	if (( "${GS_VER_MAJOR}" < 7 )) ; then
++	if [ "${GS_VER_MAJOR}" -lt 7 ] ; then
+ 		{ echo "$as_me:$LINENO: WARNING: \"GhostScript found" >&5
+ echo "$as_me: WARNING: \"GhostScript found" >&2;}
+-	elif (( "${GS_VER_MAJOR}" < 8 )) ; then
++	elif [ "${GS_VER_MAJOR}" -lt 8 ] ; then
+ 		{ echo "$as_me:$LINENO: WARNING: \"GhostScript v7 found. v8 recommended.\"" >&5
+ echo "$as_me: WARNING: \"GhostScript v7 found. v8 recommended.\"" >&2;}
+ 	fi
+@@ -44116,9 +44116,9 @@ if test -z "${GS_PATH}" ; then
+ 	echo "***GhostScript could not be found. See README.***"
+ else
+ 	echo "GhostScript ${GS_VER_MAJOR}.${GS_VER_MINOR} was found at ${GS_PATH}"
+-	if (( "${GS_VER_MAJOR}" < 7 )) ; then
++	if [ "${GS_VER_MAJOR}" -lt 7 ] ; then
+ 		echo "    *** GhostScript versions older than 7 MAY NOT WORK; v8 recommended ***"
+-	elif (( "${GS_VER_MAJOR}" < 8 )) ; then
++	elif [ "${GS_VER_MAJOR}" -lt 8 ] ; then
+ 		echo "    *** GhostScript 8 is STRONGLY recommended ***"
+ 	fi
+ fi

print/scribus/patches/patch-scribus_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-scribus_Makefile_in,v 1.1 2006/10/20 22:52:47 kili Exp $
+--- scribus/Makefile.in.orig	Sun Oct  1 15:36:06 2006
++++ scribus/Makefile.in	Sun Oct  1 15:36:49 2006
+@@ -946,7 +946,7 @@ DISTCLEANFILES = $(scribus_METASOURCES)
+ # this is to enable Qt behavoir of am_edit
+ KDE_OPTIONS = qtonly
+ AM_CPPFLAGS = \
+-    -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
++    -DDOCDIR=\"$(datadir)/doc/scribus/\" \
+     -DICONDIR=\"$(datadir)/scribus/icons/\" \
+     -DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
+     -DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \

print/scribus/patches/patch-scribus_scribus_cpp

@@ -0,0 +1,23 @@
+$OpenBSD: patch-scribus_scribus_cpp,v 1.4 2006/10/20 22:52:47 kili Exp $
+--- scribus/scribus.cpp.orig	Mon Oct  2 01:08:04 2006
++++ scribus/scribus.cpp	Sun Oct  8 23:02:58 2006
+@@ -2230,7 +2230,6 @@ void ScribusMainWindow::SwitchWin()
+ 	view->updateLayerMenu();
+ 	view->setLayerMenuText(doc->activeLayerName());
+ 	doc->currentParaStyle = 0;
+-	nodePalette->setDoc(doc, view);
+ 	slotChangeUnit(doc->unitIndex(), false);
+ 	if (doc->EditClip)
+ 	{
+@@ -3988,10 +3987,7 @@ bool ScribusMainWindow::DoFileClose()
+ //	if (doc->EditClip)
+ //		nodePalette->doc = 0;
+ 	if (doc->EditClip)
+-	{
+-		ToggleFrameEdit();
+-		nodePalette->setDoc(0,0);
+-	}
++		NoFrameEdit();
+ 
+ 	bookmarkPalette->BView->clear();
+ 	bookmarkPalette->BView->NrItems = 0;