Attachment 44599 Details for Bug 69000 – file.diff

[patch] file.diff

file.diff (text/plain), 4.56 KB, created by tkato432 on 2004-07-13 17:40:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2004-07-13 17:40:18 UTC

Size: 4.56 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/tuxcards/Makefile deskutils/tuxcards/Makefile
>--- /usr/ports/deskutils/tuxcards/Makefile	Fri Feb 27 18:56:03 2004
>+++ deskutils/tuxcards/Makefile	Tue Jul 13 22:32:42 2004
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	tuxcards
>-PORTVERSION=	1.1
>+PORTVERSION=	1.2
> CATEGORIES=	deskutils
>-MASTER_SITES=	http://www.tifskom.de/tux/${PORTVERSION}/
>+MASTER_SITES=	http://www.tifskom.de/tux/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Tool for managing notes within a hierarchical tree
>@@ -16,26 +17,22 @@
> BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
> 
> USE_QT_VER=	3
>-USE_REINPLACE=	yes
> MAKE_ENV=	QTDIR="${QT_PREFIX}"
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' ${WRKSRC}/tuxcards.pro
>-
> .include <bsd.port.pre.mk>
> 
> # Add this condititonal while people might still have old versions
> # of qmake, living in X11BASE, installed. This should go away eventually.
> 
> .if exists(${X11BASE}/share/qt/mkspecs/freebsd-g++)
>-do-configure:
>-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
>-		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ tuxcards.pro
>+QMAKESPEC=	${X11BASE}/share/qt/mkspecs/freebsd-g++
> .else
>+QMAKESPEC=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
>+.endif
>+
> do-configure:
> 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
>-		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ tuxcards.pro
>-.endif
>+		-spec ${QMAKESPEC} tuxcards.pro
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>diff -urN /usr/ports/deskutils/tuxcards/distinfo deskutils/tuxcards/distinfo
>--- /usr/ports/deskutils/tuxcards/distinfo	Thu Jan 29 20:21:00 2004
>+++ deskutils/tuxcards/distinfo	Mon Jul 12 23:21:06 2004
>@@ -1,2 +1,2 @@
>-MD5 (tuxcards-1.1.tar.gz) = 711da6fdabacd4c5f3a2491ca29fef36
>-SIZE (tuxcards-1.1.tar.gz) = 233649
>+MD5 (tuxcards-1.2.tar.gz) = ee85e2e5c23425fd031c62a5e2f6f248
>+SIZE (tuxcards-1.2.tar.gz) = 203129
>diff -urN /usr/ports/deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp
>--- /usr/ports/deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp	Thu Jan  1 09:00:00 1970
>+++ deskutils/tuxcards/files/patch-src::information::CInformationElementHistory.cpp	Tue Jul 13 22:33:38 2004
>@@ -0,0 +1,11 @@
>+--- src/information/CInformationElementHistory.cpp.orig	Fri Dec  5 07:22:09 2003
>++++ src/information/CInformationElementHistory.cpp	Tue Jul 13 22:32:26 2004
>+@@ -156,7 +156,7 @@
>+ 
>+       CInformationElement* pIE = mList.at(i);
>+       std::cout<<i<<sSeparator<<pIE<<"\t";
>+-      sDesc =  (NULLPTR != pIE) ? pIE->getDescription() : "NULLPTR";
>++      sDesc =  (NULLPTR != pIE) ? pIE->getDescription() : QString("NULLPTR");
>+       std::cout<<sDesc<<std::endl;
>+    }
>+ 
>diff -urN /usr/ports/deskutils/tuxcards/pkg-plist deskutils/tuxcards/pkg-plist
>--- /usr/ports/deskutils/tuxcards/pkg-plist	Mon Jan  6 15:55:56 2003
>+++ deskutils/tuxcards/pkg-plist	Mon Jul 12 23:44:10 2004
>@@ -1,21 +1,21 @@
> bin/tuxcards
>-%%PORTDOCS%%share/doc/tuxcards/TuxCardsBunt.gif
>-%%PORTDOCS%%share/doc/tuxcards/addKnoten.gif
>-%%PORTDOCS%%share/doc/tuxcards/changeProberty.gif
>-%%PORTDOCS%%share/doc/tuxcards/deleteKnoten.gif
>-%%PORTDOCS%%share/doc/tuxcards/index-1.html
>-%%PORTDOCS%%share/doc/tuxcards/index-2.html
>-%%PORTDOCS%%share/doc/tuxcards/index-3.html
>-%%PORTDOCS%%share/doc/tuxcards/index-4.html
>-%%PORTDOCS%%share/doc/tuxcards/index-5.html
>-%%PORTDOCS%%share/doc/tuxcards/index-6.html
>-%%PORTDOCS%%share/doc/tuxcards/index.html
>-%%PORTDOCS%%share/doc/tuxcards/index.nif
>-%%PORTDOCS%%share/doc/tuxcards/index.sgml
>-%%PORTDOCS%%share/doc/tuxcards/logotp3.png
>-%%PORTDOCS%%share/doc/tuxcards/new.gif
>-%%PORTDOCS%%share/doc/tuxcards/open.gif
>-%%PORTDOCS%%share/doc/tuxcards/save.gif
>-%%PORTDOCS%%share/doc/tuxcards/search.gif
>-%%PORTDOCS%%share/doc/tuxcards/whatis.gif
>-%%PORTDOCS%%@dirrm share/doc/tuxcards
>+%%PORTDOCS%%%%DOCSDIR%%/TuxCardsBunt.gif
>+%%PORTDOCS%%%%DOCSDIR%%/addKnoten.gif
>+%%PORTDOCS%%%%DOCSDIR%%/changeProberty.gif
>+%%PORTDOCS%%%%DOCSDIR%%/deleteKnoten.gif
>+%%PORTDOCS%%%%DOCSDIR%%/index-1.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-2.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-3.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-4.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-5.html
>+%%PORTDOCS%%%%DOCSDIR%%/index-6.html
>+%%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%%%DOCSDIR%%/index.nif
>+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
>+%%PORTDOCS%%%%DOCSDIR%%/logotp3.png
>+%%PORTDOCS%%%%DOCSDIR%%/new.gif
>+%%PORTDOCS%%%%DOCSDIR%%/open.gif
>+%%PORTDOCS%%%%DOCSDIR%%/save.gif
>+%%PORTDOCS%%%%DOCSDIR%%/search.gif
>+%%PORTDOCS%%%%DOCSDIR%%/whatis.gif
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 69000: 44599