diff options
| author | joerg <joerg@pkgsrc.org> | 2009-10-28 00:53:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-10-28 00:53:56 +0000 |
| commit | 875a303396b4c8c826d8301333dd335b88a85e28 (patch) | |
| tree | fd24ccbf79468f3ca5b5dbf543782fbf74a2e61f /print/scribus | |
| parent | dbf0fc674df6607bb85830e7b5b76de8e396b323 (diff) | |
| download | pkgsrc-875a303396b4c8c826d8301333dd335b88a85e28.tar.gz | |
We want to stinking lib64, thanks. Fixes packages on amd64 and other
64bit platforms.
Diffstat (limited to 'print/scribus')
| -rw-r--r-- | print/scribus/distinfo | 4 | ||||
| -rw-r--r-- | print/scribus/patches/patch-ai | 38 |
2 files changed, 37 insertions, 5 deletions
diff --git a/print/scribus/distinfo b/print/scribus/distinfo index 10b22cb060a..e9a048ce723 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.22 2009/10/28 00:53:56 joerg 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..40445e22cec 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.2 2009/10/28 00:53:56 joerg 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 |