Attachment 50478 Details for Bug 76895 – file.diff

[patch] file.diff

file.diff (text/plain), 8.92 KB, created by tkato432 on 2005-01-31 15:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-01-31 15:10:16 UTC

Size: 8.92 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/kdissert/Makefile deskutils/kdissert/Makefile
>--- /usr/ports/deskutils/kdissert/Makefile	Wed Jan 12 13:36:11 2005
>+++ deskutils/kdissert/Makefile	Mon Jan 31 20:10:36 2005
>@@ -6,34 +6,99 @@
> #
> 
> PORTNAME=	kdissert
>-PORTVERSION=	0.3.1
>+PORTVERSION=	0.3.4.1
> CATEGORIES=	deskutils kde
>-MASTER_SITES=	http://freehackers.org/~tnagy/kdissert/ \
>+MASTER_SITES=	http://www.freehackers.org/~tnagy/kdissert/ \
> 		ftp://ftp.fasta.fh-dortmund.de/mirror/gentoo/distfiles/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	KDE mindmapping tool
> 
>-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
>+BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons \
>+		gsed:${PORTSDIR}/textproc/gsed
> 
> USE_BZIP2=	yes
> USE_KDELIBS_VER=	3
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-WANT_LIBTOOL_VER=	15
>-MAKE_ARGS=	CXX="${CXX}" \
>-		COMMONCXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
>-		LIBTOOL="${LIBTOOL} --silent --tag=CXX" \
>-		SUBLIBS="${PTHREAD_LIBS}" \
>-		SHELL="${LOCALBASE}/bin/bash"
>-INSTALLS_SHLIB=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|#!/bin/bash|!#!${LOCALBASE}/bin/bash|g ; \
>-		 s|-en|-n|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's:%%CXX%%:${CXX}:g ; \
>+		 s:%%CXXFLAGS%%:${CXXFLAGS} ${PTHREAD_CFLAGS}:g ; \
>+		 s:%%LINKFLAGS%%:${PTHREAD_LIBS}:g' ${WRKSRC}/SConstruct
>+	@${REINPLACE_CMD} -e \
>+		's:-en:-n:g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's:|sed:|gsed:g' ${WRKSRC}/kde.py
> 
> do-configure:
>-	@cd ${WRKSRC} \
>-		&& QTDIR="${QT_PREFIX}" ./configure --prefix="${PREFIX}"
>+	@cd ${CONFIGURE_WRKSRC} && ./configure --prefix="${PREFIX}"
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/kdissert/kdissert ${PREFIX}/bin
>+	@${MKDIR} ${PREFIX}/lib/kde3
>+	${INSTALL_DATA} ${WRKSRC}/src/templates/*.la ${PREFIX}/lib/kde3
>+	${INSTALL_DATA} ${WRKSRC}/src/templates/*.so ${PREFIX}/lib/kde3
>+	@${MKDIR} ${PREFIX}/share/applications/kde
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissert.desktop \
>+		${PREFIX}/share/applications/kde
>+	@${MKDIR} ${PREFIX}/share/applnk/Utilities
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissert.desktop \
>+		${PREFIX}/share/applnk/Utilities
>+	@${MKDIR} ${PREFIX}/share/apps/kdissert
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertui.rc \
>+		${PREFIX}/share/apps/kdissert
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/tips \
>+		${PREFIX}/share/apps/kdissert
>+	@${MKDIR} ${PREFIX}/share/apps/kdissert/pics
>+	${INSTALL_DATA} ${WRKSRC}/src/pics/nopix.png \
>+		${PREFIX}/share/apps/kdissert/pics
>+	@${MKDIR} ${PREFIX}/share/apps/kdissert/templatedata
>+	${INSTALL_DATA} ${WRKSRC}/src/templates/*.tar.gz \
>+		${PREFIX}/share/apps/kdissert/templatedata
>+	@${MKDIR} ${PREFIX}/share/apps/kdissertpart
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertpart.rc \
>+		${PREFIX}/share/apps/kdissertpart
>+	@${MKDIR} ${PREFIX}/share/config.kcfg
>+	${INSTALL_DATA} ${WRKSRC}/src/kdissert/kdissert.kcfg \
>+		${PREFIX}/share/config.kcfg
>+.for lang in en fr
>+	@${MKDIR} ${PREFIX}/share/doc/HTML/${lang}/kdissert
>+	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.cache.bz2 \
>+		${PREFIX}/share/doc/HTML/${lang}/kdissert
>+	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/index.docbook \
>+		${PREFIX}/share/doc/HTML/${lang}/kdissert
>+	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/screenshot.png \
>+		${PREFIX}/share/doc/HTML/${lang}/kdissert
>+.endfor
>+.for size in 16 22 32 64 128
>+	@${MKDIR} ${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions
>+	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_sort.png \
>+		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_sort.png
>+.endfor
>+.for size in 16 22 32
>+	@${MKDIR} ${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions
>+	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_link.png \
>+		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_link.png
>+	${INSTALL_DATA} ${WRKSRC}/src/pics/toolbar/cr${size}-action-kdissert_point.png \
>+		${PREFIX}/share/icons/crystalsvg/${size}x${size}/actions/kdissert_point.png
>+.endfor
>+.for size in 16 32 64 128
>+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/hi${size}-app-kdissert.png \
>+		${PREFIX}/share/icons/hicolor/${size}x${size}/apps/kdissert.png
>+.endfor
>+.for lang in de fr nl pl
>+	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
>+	${INSTALL_DATA} ${WRKSRC}/po/${lang}.gmo \
>+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/kdissert.mo
>+.endfor
>+	@${MKDIR} ${PREFIX}/share/mimelnk/application
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/x-kdissert.desktop \
>+		${PREFIX}/share/mimelnk/application
>+	@${MKDIR} ${PREFIX}/share/services
>+	${INSTALL_DATA} ${WRKSRC}/src/appdata/kdissertpart.desktop \
>+		${PREFIX}/share/services
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/deskutils/kdissert/distinfo deskutils/kdissert/distinfo
>--- /usr/ports/deskutils/kdissert/distinfo	Thu Dec 16 14:04:30 2004
>+++ deskutils/kdissert/distinfo	Mon Jan 31 19:40:18 2005
>@@ -1,2 +1,2 @@
>-MD5 (kdissert-0.3.1.tar.bz2) = 78e8f19733df54e0f47479aaa3d27d98
>-SIZE (kdissert-0.3.1.tar.bz2) = 443163
>+MD5 (kdissert-0.3.4.1.tar.bz2) = d3ee0bec6fcbe1c7b81eb00d4eb1a2d4
>+SIZE (kdissert-0.3.4.1.tar.bz2) = 506195
>diff -urN /usr/ports/deskutils/kdissert/files/patch-SConstruct deskutils/kdissert/files/patch-SConstruct
>--- /usr/ports/deskutils/kdissert/files/patch-SConstruct	Thu Jan  1 09:00:00 1970
>+++ deskutils/kdissert/files/patch-SConstruct	Tue Jan 18 19:51:28 2005
>@@ -0,0 +1,13 @@
>+--- SConstruct.orig	Sun Jan 16 00:08:50 2005
>++++ SConstruct	Tue Jan 18 19:45:45 2005
>+@@ -14,6 +14,10 @@
>+ 
>+ env.AppendUnique(LIBS = ['qt-mt', 'kdecore'])
>+ 
>++env['CXX'] = "%%CXX%%"
>++env['CXXFLAGS'] = "%%CXXFLAGS%%"
>++env.AppendUnique(LINKFLAGS = ['%%LINKFLAGS%%'])
>++
>+ env['ITARGETS'] = []
>+ 
>+ ### subdirectories
>diff -urN /usr/ports/deskutils/kdissert/pkg-plist deskutils/kdissert/pkg-plist
>--- /usr/ports/deskutils/kdissert/pkg-plist	Wed Jan 26 18:05:30 2005
>+++ deskutils/kdissert/pkg-plist	Tue Jan 18 23:25:28 2005
>@@ -25,11 +25,14 @@
> share/apps/kdissert/templatedata/kdisspdflatexbook.tar.gz
> share/apps/kdissert/templatedata/kdissprosperslides.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.png
>+share/doc/HTML/fr/kdissert/index.cache.bz2
>+share/doc/HTML/fr/kdissert/index.docbook
>+share/doc/HTML/fr/kdissert/screenshot.png
> share/icons/crystalsvg/128x128/actions/kdissert_sort.png
> share/icons/crystalsvg/16x16/actions/kdissert_link.png
> share/icons/crystalsvg/16x16/actions/kdissert_point.png
>@@ -48,42 +51,12 @@
> share/locale/de/LC_MESSAGES/kdissert.mo
> share/locale/fr/LC_MESSAGES/kdissert.mo
> share/locale/nl/LC_MESSAGES/kdissert.mo
>-share/locale/no/LC_MESSAGES/kdissert.mo
> share/locale/pl/LC_MESSAGES/kdissert.mo
> share/mimelnk/application/x-kdissert.desktop
>-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
>-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
>-@dirrm share/icons/crystalsvg/64x64/actions/kdissert
>-@unexec rmdir %D/share/icons/crystalsvg/64x64/actions 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
>-@dirrm share/icons/crystalsvg/32x32/actions/kdissert
>-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
>-@dirrm share/icons/crystalsvg/22x22/actions/kdissert
>-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
>-@dirrm share/icons/crystalsvg/16x16/actions/kdissert
>-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
>-@dirrm share/icons/crystalsvg/128x128/actions/kdissert
>-@unexec rmdir %D/share/icons/crystalsvg/128x128/actions 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || true
>-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
>-@unexec rmdir %D/share/icons 2>/dev/null || true
>+share/services/kdissertpart.desktop
>+@dirrm share/doc/HTML/fr/kdissert
> @dirrm share/doc/HTML/en/kdissert
>-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
>+@dirrm share/apps/kdissertpart
> @dirrm share/apps/kdissert/templatedata
> @dirrm share/apps/kdissert/pics
> @dirrm share/apps/kdissert
>-@unexec rmdir %D/share/apps 2>/dev/null || true
>-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
>-@unexec rmdir %D/share/applnk 2>/dev/null || true
>-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
>-@unexec rmdir %D/share/applications 2>/dev/null || true

Actions: View | Diff

Attachments on bug 76895: 50478