From 2074b8053efcfa7cbf4baa4ef1186bcc418c9829 Mon Sep 17 00:00:00 2001
From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Date: Tue, 1 Aug 2006 19:41:10 +0000
Subject: Update to version 1.0.6
PR: ports/101190
Submitted by: KATO Tsuguru
---
deskutils/kdissert/Makefile | 29 ++++++++++++----------
deskutils/kdissert/distinfo | 6 ++---
deskutils/kdissert/files/patch-SConstruct | 13 ----------
.../files/patch-src__kdissert__wscript_build | 11 ++++++++
deskutils/kdissert/pkg-plist | 15 +++++++++--
5 files changed, 43 insertions(+), 31 deletions(-)
delete mode 100644 deskutils/kdissert/files/patch-SConstruct
create mode 100644 deskutils/kdissert/files/patch-src__kdissert__wscript_build
(limited to 'deskutils/kdissert')
diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index 6cf60d1141ec..02b8d3351320 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -6,21 +6,22 @@
#
PORTNAME= kdissert
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.0.6
CATEGORIES= deskutils kde
MASTER_SITES= http://www.kde-apps.org/content/files/
-DISTNAME= 12725-${PORTNAME}-${PORTVERSION}
+DISTNAME= 12725-${PORTNAME}-${PORTVERSION}-waf-b
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE mindmapping tool
-BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${DISTNAME:S/^12725-//}
USE_BZIP2= yes
+USE_GETTEXT= yes
+INSTALLS_ICONS= yes
USE_KDELIBS_VER= 3
+USE_PYTHON_BUILD= yes
+MAKE_ENV= QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
.include <bsd.port.pre.mk>
@@ -28,21 +29,23 @@ USE_KDELIBS_VER= 3
CXXFLAGS+= -fpermissive
.endif
+post-extract:
+ @cd ${WRKSRC} && ${TAR} yxf miniwaf.tar.bz2
+
post-patch:
@${REINPLACE_CMD} -e \
- 's:%%CXX%%:${CXX}:g ; \
- s:%%CXXFLAGS%%:${CXXFLAGS} ${PTHREAD_CFLAGS}:g ; \
- s:%%LINKFLAGS%%:${PTHREAD_LIBS}:g' ${WRKSRC}/SConstruct
+ 's|%%LINKFLAGS%%|${PTHREAD_LIBS}|g ; \
+ s|%%CPPFLAGS%%|${PTHREAD_CFLAGS}|g' \
+ ${WRKSRC}/src/kdissert/wscript_build
do-configure:
- @cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" \
- QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" scons configure
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py configure
do-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py
do-install:
- @cd ${WRKSRC} && scons install
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py install
@${STRIP_CMD} ${PREFIX}/bin/kdissert
.include <bsd.port.post.mk>
diff --git a/deskutils/kdissert/distinfo b/deskutils/kdissert/distinfo
index 945e505d0038..18b631c5ece8 100644
--- a/deskutils/kdissert/distinfo
+++ b/deskutils/kdissert/distinfo
@@ -1,3 +1,3 @@
-MD5 (12725-kdissert-1.0.5.tar.bz2) = 18ff5d04d633cf3b4e3fbf869c18dd2f
-SHA256 (12725-kdissert-1.0.5.tar.bz2) = b3485d1bc2a5363a94d261f04a4633f30b39d334c3b638f360f7b0d029a83300
-SIZE (12725-kdissert-1.0.5.tar.bz2) = 489281
+MD5 (12725-kdissert-1.0.6-waf-b.tar.bz2) = abeb507a79aed0cc4ef6d1a4ee58ea94
+SHA256 (12725-kdissert-1.0.6-waf-b.tar.bz2) = 91e4aba8cf10c1a5eb7ce1776afca65aed0611c1ca95e199a7dd3b3edd4450d9
+SIZE (12725-kdissert-1.0.6-waf-b.tar.bz2) = 501346
diff --git a/deskutils/kdissert/files/patch-SConstruct b/deskutils/kdissert/files/patch-SConstruct
deleted file mode 100644
index 979ed36f956c..000000000000
--- a/deskutils/kdissert/files/patch-SConstruct
+++ /dev/null
@@ -1,13 +0,0 @@
---- SConstruct.orig Mon Jul 11 00:47:41 2005
-+++ SConstruct Sun Jul 24 02:59:09 2005
-@@ -21,6 +21,10 @@
-
- env.KDEuse("environ rpath")
-
-+env['CXX'] = "%%CXX%%"
-+env['CPPFLAGS'] = "%%CXXFLAGS%%"
-+env.AppendUnique(LINKFLAGS = ['%%LINKFLAGS%%'])
-+
- ###################################################################
- # SCRIPTS FOR BUILDING THE TARGETS
- ###################################################################
diff --git a/deskutils/kdissert/files/patch-src__kdissert__wscript_build b/deskutils/kdissert/files/patch-src__kdissert__wscript_build
new file mode 100644
index 000000000000..3eb7af2dc713
--- /dev/null
+++ b/deskutils/kdissert/files/patch-src__kdissert__wscript_build
@@ -0,0 +1,11 @@
+--- src/kdissert/wscript_build.orig Tue May 23 05:47:16 2006
++++ src/kdissert/wscript_build Sat Jul 22 14:24:30 2006
+@@ -8,6 +8,8 @@
+ obj.uselib = 'QT KDECORE KIO KPARTS KMDI KDEPRINT'
+ obj.target = 'kdissert'
+ obj.env.appendValue('LINKFLAGS', ['-export-dynamic'])
++obj.env.appendValue('LINKFLAGS', ['%%LINKFLAGS%%'])
+ obj.env.appendValue('CPPFLAGS', ['-trigraphs'])
++obj.env.appendValue('CPPFLAGS', ['%%CPPFLAGS%%'])
+ obj.includes = '. datastruct canvasview gui shell treelistview'
+
diff --git a/deskutils/kdissert/pkg-plist b/deskutils/kdissert/pkg-plist
index 8590a0dbc053..6f8a94ceff62 100644
--- a/deskutils/kdissert/pkg-plist
+++ b/deskutils/kdissert/pkg-plist
@@ -36,11 +36,9 @@ share/apps/kdissert/templatedata/kdissstx.tar.gz
share/apps/kdissert/tips
share/apps/kdissertpart/kdissertpart.rc
share/config.kcfg/kdissert.kcfg
-share/doc/HTML/en/kdissert/common
share/doc/HTML/en/kdissert/index.cache.bz2
share/doc/HTML/en/kdissert/index.docbook
share/doc/HTML/en/kdissert/screenshot.jpg
-share/doc/HTML/fr/kdissert/common
share/doc/HTML/fr/kdissert/index.cache.bz2
share/doc/HTML/fr/kdissert/index.docbook
share/icons/hicolor/128x128/actions/kdissert_sort.png
@@ -59,12 +57,25 @@ share/icons/hicolor/32x32/actions/kdissert_sort.png
share/icons/hicolor/32x32/apps/kdissert.png
share/icons/hicolor/64x64/actions/kdissert_sort.png
share/icons/hicolor/64x64/apps/kdissert.png
+share/locale/bg/LC_MESSAGES/kdissert.mo
+share/locale/br/LC_MESSAGES/kdissert.mo
+share/locale/cs/LC_MESSAGES/kdissert.mo
+share/locale/da/LC_MESSAGES/kdissert.mo
share/locale/de/LC_MESSAGES/kdissert.mo
+share/locale/el/LC_MESSAGES/kdissert.mo
share/locale/es/LC_MESSAGES/kdissert.mo
share/locale/fr/LC_MESSAGES/kdissert.mo
+share/locale/ga/LC_MESSAGES/kdissert.mo
+share/locale/gl/LC_MESSAGES/kdissert.mo
share/locale/it/LC_MESSAGES/kdissert.mo
+share/locale/ka/LC_MESSAGES/kdissert.mo
share/locale/nl/LC_MESSAGES/kdissert.mo
share/locale/pl/LC_MESSAGES/kdissert.mo
+share/locale/pt/LC_MESSAGES/kdissert.mo
+share/locale/pt_BR/LC_MESSAGES/kdissert.mo
+share/locale/ru/LC_MESSAGES/kdissert.mo
+share/locale/sv/LC_MESSAGES/kdissert.mo
+share/locale/tr/LC_MESSAGES/kdissert.mo
share/mimelnk/application/x-kdissert.desktop
share/services/kdissertpart.desktop
@dirrm share/doc/HTML/fr/kdissert
--
cgit v1.2.3