Wed Oct 28 19:04:45 2009 UTC ()
Backout unintentional change which is not related to ticket #2923.


(tron)
diff -r1.62.2.1 -r1.62.2.2 pkgsrc/print/scribus/Makefile
cvs diff -r1.62.2.1 -r1.62.2.2 pkgsrc/print/scribus/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/scribus/Attic/Makefile 2009/10/28 18:13:24 1.62.2.1
+++ pkgsrc/print/scribus/Attic/Makefile 2009/10/28 19:04:45 1.62.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.62.2.1 2009/10/28 18:13:24 tron Exp $ 1# $NetBSD: Makefile,v 1.62.2.2 2009/10/28 19:04:45 tron Exp $
2 2
3DISTNAME= scribus-1.3.3.13 3DISTNAME= scribus-1.3.3.13
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.scribus.net/ 9HOMEPAGE= http://www.scribus.net/
10COMMENT= Publishing layout with graphical interface 10COMMENT= Publishing layout with graphical interface
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -18,28 +18,26 @@ PTHREAD_OPTS+= require @@ -18,28 +18,26 @@ PTHREAD_OPTS+= require
18SHLIBTOOL_OVERRIDE= # empty 18SHLIBTOOL_OVERRIDE= # empty
19USE_CMAKE= yes 19USE_CMAKE= yes
20CONFIGURE_ARGS+= --enable-cairo 20CONFIGURE_ARGS+= --enable-cairo
21CONFIGURE_ARGS+= --with-extra-includes=${PREFIX}/include 21CONFIGURE_ARGS+= --with-extra-includes=${PREFIX}/include
22CONFIGURE_ARGS+= --with-extra-libs=${PREFIX}/lib 22CONFIGURE_ARGS+= --with-extra-libs=${PREFIX}/lib
23CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} 23CONFIGURE_ARGS+= --with-qt-dir=${QTDIR}
24# XXX should work with other Python versions, but there are 24# XXX should work with other Python versions, but there are
25# stupid assumptions in the configure script 25# stupid assumptions in the configure script
26PYTHON_VERSIONS_ACCEPTED= 25 24 26PYTHON_VERSIONS_ACCEPTED= 25 24
27CONFIGURE_ARGS+= --with-pythondir=${PREFIX} 27CONFIGURE_ARGS+= --with-pythondir=${PREFIX}
28# XXX make an option 28# XXX make an option
29CONFIGURE_ARGS+= --disable-cups 29CONFIGURE_ARGS+= --disable-cups
30 30
31INSTALLATION_DIRS+= share/pixmaps 
32 
33post-install: 31post-install:
34 ${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \ 32 ${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \
35 ${DESTDIR}${PREFIX}/share/pixmaps 33 ${DESTDIR}${PREFIX}/share/pixmaps
36 34
37.include "../../print/cups/buildlink3.mk" 35.include "../../print/cups/buildlink3.mk"
38.include "../../graphics/cairo/buildlink3.mk" 36.include "../../graphics/cairo/buildlink3.mk"
39.include "../../graphics/jpeg/buildlink3.mk" 37.include "../../graphics/jpeg/buildlink3.mk"
40BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1 38BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
41.include "../../graphics/libart/buildlink3.mk" 39.include "../../graphics/libart/buildlink3.mk"
42.include "../../graphics/tiff/buildlink3.mk" 40.include "../../graphics/tiff/buildlink3.mk"
43.include "../../textproc/libxml2/buildlink3.mk" 41.include "../../textproc/libxml2/buildlink3.mk"
44.include "../../x11/libSM/buildlink3.mk" 42.include "../../x11/libSM/buildlink3.mk"
45.include "../../x11/libX11/buildlink3.mk" 43.include "../../x11/libX11/buildlink3.mk"