Pullup ticket 2922 - requested by he

scribus: build fix

Revisions pulled up:
- print/scribus/Makefile			1.64
- print/scribus/distinfo			1.22
- print/scribus/patches/patch-ai		1.2
---
Module Name:	pkgsrc
Committed By:	he
Date:		Sat Oct 24 13:41:05 UTC 2009

Modified Files:
	pkgsrc/print/scribus: Makefile

Log Message:
Add INSTALLATION_DIRS of share/pixmap, that way we ensure that it doesn't
end up as a file instead of as a directory.  Fixes old-style bulk builds
for subsequent packages which want to install in that directory.
---
Module Name:	pkgsrc
Committed By:	joerg
Date:		Wed Oct 28 00:53:56 UTC 2009

Modified Files:
	pkgsrc/print/scribus: distinfo
	pkgsrc/print/scribus/patches: patch-ai

Log Message:
We want to stinking lib64, thanks. Fixes packages on amd64 and other
64bit platforms.

3 files changed, 40 insertions, 6 deletions

diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index a203942bf16..44cb0c1cae5 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62.2.2 2009/10/28 19:04:45 tron Exp $
+# $NetBSD: Makefile,v 1.62.2.3 2009/11/27 21:30:47 tron Exp $
 
 DISTNAME=		scribus-1.3.3.13
 CATEGORIES=		print
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+=	--with-pythondir=${PREFIX}
 # XXX make an option
 CONFIGURE_ARGS+=	--disable-cups
 
+INSTALLATION_DIRS+=	share/pixmaps
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
diff --git a/print/scribus/distinfo b/print/scribus/distinfo
index 10b22cb060a..7788e5f1cfe 100644
--- a/print/scribus/distinfo
+++ b/print/scribus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2009/09/16 09:24:55 drochner Exp $
+$NetBSD: distinfo,v 1.21.2.1 2009/11/27 21:30:47 tron Exp $
 
 SHA1 (scribus-1.3.3.13.tar.bz2) = 72625d2c172c991c88e521f6597b914365eba320
 RMD160 (scribus-1.3.3.13.tar.bz2) = c12860f38e103c1f7249449b0316a69bf8bdafbf
@@ -9,4 +9,4 @@ SHA1 (patch-ad) = 03a4edef89cf4f8d78b20c5a4b7809036ba8d694
 SHA1 (patch-ae) = 063d4737cbffd3f712d505818fd028f132267c90
 SHA1 (patch-ag) = dbe050de9796992f01d791af0639895683654f7c
 SHA1 (patch-ah) = 51d12aabcbdc7abbee12b0a445b57311b6bd28d4
-SHA1 (patch-ai) = 0dbdb9ac902f09e29782c3557cc1f6da947767f4
+SHA1 (patch-ai) = 756a4db673ebdcf650cfe1a6d1556acdc0b60dad
diff --git a/print/scribus/patches/patch-ai b/print/scribus/patches/patch-ai
index 9bdc841228b..72b370e8993 100644
--- a/print/scribus/patches/patch-ai
+++ b/print/scribus/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2009/09/16 09:24:55 drochner Exp $
+$NetBSD: patch-ai,v 1.1.2.1 2009/11/27 21:30:47 tron Exp $
 
---- CMakeLists.txt.orig	2009-04-14 22:52:13.000000000 +0200
+--- CMakeLists.txt.orig	2009-10-28 01:31:30.000000000 +0100
 +++ CMakeLists.txt
 @@ -116,7 +116,7 @@ IF (WANT_VERSIONING AND NOT CACHED_VERSI
  ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
@@ -11,7 +11,39 @@ $NetBSD: patch-ai,v 1.1 2009/09/16 09:24:55 drochner Exp $
  SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
  ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
  #SHARE
-@@ -496,15 +496,15 @@ scribus.xml
+@@ -144,30 +144,7 @@ ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${CMAK
+ 
+ #LIB LOCATION - lib or lib64 normally
+ #LIB
+-IF(WANT_LIB64)
+-  IF(NOT ARCH64BIT)
+-    MESSAGE(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
+-  ENDIF(NOT ARCH64BIT)
+-  SET(LIB_SUFFIX "64" CACHE TYPE STRING)
+-ENDIF(WANT_LIB64)
+-#OVERRIDE WANT_LIB64 with WANT_LIB32 if both exist
+-IF(WANT_LIB32)
+-  IF(ARCH64BIT)
+-    MESSAGE(STATUS "WARNING: FORCING 32 Bit build on 64 bit architecture")
+-  ENDIF(ARCH64BIT)
+-  SET(LIB_SUFFIX "" CACHE TYPE STRING)
+-  SET(WANT_LIB64 "")
+-ENDIF(WANT_LIB32)
+-#Auto build 64 bit if user doesnt force 32 bit and we detect 64 bit
+-IF(ARCH64BIT AND NOT LIB_SUFFIX)
+-  IF(NOT WANT_LIB32)
+-    IF(NOT WANT_LIB64)
+-      MESSAGE(STATUS "Autodetected 64 bit architecture, building for 64 Bit")
+-      SET(LIB_SUFFIX "64" CACHE TYPE STRING)
+-    ENDIF(NOT WANT_LIB64)
+-  ENDIF(NOT WANT_LIB32)
+-ENDIF(ARCH64BIT AND NOT LIB_SUFFIX)
+-
++SET(LIB_SUFFIX "" CACHE TYPE STRING)
+ 
+ SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
+ SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
+@@ -496,15 +473,15 @@ scribus.xml
  DESTINATION ${MIMEDIR}
  )
  #KDE workaround until it starts supporting freedesktop spec