Attachment 138814 Details for Bug 184893 – file.diff

[patch] file.diff

file.diff (text/plain), 4.67 KB, created by tkato432 on 2013-12-16 18:10:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-12-16 18:10:26 UTC

Size: 4.67 KB

patch

obsolete

>diff -urN /usr/ports/editors/textroom/Makefile editors/textroom/Makefile
>--- /usr/ports/editors/textroom/Makefile	2013-11-22 07:07:11.000000000 +0900
>+++ editors/textroom/Makefile	2013-12-17 00:00:00.000000000 +0900
>@@ -3,27 +3,32 @@
> 
> PORTNAME=	textroom
> PORTVERSION=	0.8.2
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	editors
> MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Full screen text editor
> 
>-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
>-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
>-		libcurl.so:${PORTSDIR}/ftp/curl
>+LICENSE=	GPLv3
> 
>-USES=		qmake shared-mime-info
>+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>+		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
>+		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
>+
>+USES=		desktop-file-utils pkgconfig qmake
>+USE_GL=		gl
> USE_SDL=	mixer
>-USE_QT4=	moc_build rcc_build uic_build corelib gui xml \
>-		svg opengl qt3support
>-QMAKE_ARGS=	LOCALBASE=${LOCALBASE}
>+USE_QT4=	moc_build rcc_build uic_build \
>+		corelib gui opengl qt3support svg xml
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
>-		${WRKSRC}/application/src/textroom.cpp \
>-		${WRKSRC}/application/src/getaword.cpp \
>-		${WRKSRC}/application/src/optionsdialog.cpp
>+.for i in getaword.cpp optionsdialog.cpp textroom.cpp 
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/share|${PREFIX}/share|' ${WRKSRC}/application/src/${i}
>+.endfor
>+
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/textroom
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/editors/textroom/files/patch-application_application.pro editors/textroom/files/patch-application_application.pro
>--- /usr/ports/editors/textroom/files/patch-application_application.pro	2013-11-06 22:06:09.000000000 +0900
>+++ editors/textroom/files/patch-application_application.pro	2013-12-17 00:00:00.000000000 +0900
>@@ -1,14 +1,14 @@
> --- application/application.pro.orig	2011-01-22 03:25:20.000000000 +0100
> +++ application/application.pro	2011-02-10 21:37:18.000000000 +0100
>-@@ -4,19 +4,20 @@
>+@@ -4,20 +4,16 @@
>      src \
>      ui
>  
> -linux-g++ {
>-+freebsd-g++ {
>++unix {
>  	INCLUDEPATH += . \
>  	    src \
>- 	    src/include \
>+-	    src/include \
> -	    /usr/include \
> -	    /usr/include/hunspell \
> -	    /usr/include/libxml++-2.6 \
>@@ -18,37 +18,41 @@
> -	    /usr/lib/glib-2.0/include \
> -	    /usr/lib/libxml++-2.6/include \
> -	    /usr/include/SDL
>-+	    $$LOCALBASE/include \
>-+	    $$LOCALBASE/include/hunspell \
>-+	    $$LOCALBASE/include/libxml++-2.6 \
>-+	    $$LOCALBASE/include//libxml++-2.6/include \
>-+	    $$LOCALBASE/include/glibmm-2.4 \
>-+	    $$LOCALBASE/lib/glibmm-2.4/include \
>-+	    $$LOCALBASE/include/glib-2.0 \
>-+	    $$LOCALBASE/lib/glib-2.0/include \
>-+	    $$LOCALBASE/lib/libxml++-2.6/include \
>-+	    $$LOCALBASE/include/SDL
>- 	
>+-	
>++	    src/include
>++	PKGCONFIG += \
>++	    glib-2.0 \
>++	    hunspell \
>++	    libcurl \
>++	    libxml++-2.6 \
>++	    SDL_mixer
>  }
>  
>-@@ -85,7 +86,7 @@
>+ macx {
>+@@ -85,40 +81,33 @@
>      src/asciireporter.cpp
>  RESOURCES += resource/textroom.qrc \
>  	resource/images/icons-app.qrc 
> -linux-g++ {
>-+freebsd-g++ {
>++unix {
>      CONFIG += release \
>++        link_pkgconfig \
>          build_all
>      INSTALLS += data \
>-@@ -98,27 +99,27 @@
>+         dict \
>+         target \
>+         desktop \
>+-        uninstaller \
>+         mime \
>+ 	words \
>          icon
>-     LIBS = -lSDL_mixer \
>- 	-lSDL \
>+-    LIBS = -lSDL_mixer \
>+-	-lSDL \
> -        -lhunspell \
>-+	-lhunspell-1.3 \
>- 	-lglibmm-2.4 \
>- 	-lcurl \
>- 	-lxml++-2.6 \
>+-	-lglibmm-2.4 \
>+-	-lcurl \
>+-	-lxml++-2.6 \
>++    LIBS = \
>  	$$TOPDIR/lib/libflo.a
> -    data.path = /usr/share/sounds
> +    data.path = $$PREFIX/share/sounds
>@@ -68,8 +72,7 @@
> +    mime.path = $$PREFIX/share/textroom
>      mime.files = resource/desktop/textroom-txr-mime.xml
> -    uninstaller.path = /usr/bin
>-+    uninstaller.path = $$PREFIX/bin
>-     uninstaller.files = resource/desktop/textroom-uninstall
>+-    uninstaller.files = resource/desktop/textroom-uninstall
> -    dict.path = /usr/share/hunspell
> +    dict.path = $$PREFIX/share/hunspell
>      dict.files = resource/dict/*
>diff -urN /usr/ports/editors/textroom/pkg-plist editors/textroom/pkg-plist
>--- /usr/ports/editors/textroom/pkg-plist	2013-11-06 22:06:09.000000000 +0900
>+++ editors/textroom/pkg-plist	2013-12-17 00:00:00.000000000 +0900
>@@ -1,13 +1,12 @@
> bin/textroom
>-bin/textroom-uninstall
> share/applications/textroom.desktop
>-share/textroom/textroom-txr-mime.xml
>-share/textroom/words.txt
> share/hunspell/tr.aff
> share/hunspell/tr.dic
> share/pixmaps/textroom.png
> share/sounds/keyany.wav
> share/sounds/keyenter.wav
>+%%DATADIR%%/textroom-txr-mime.xml
>+%%DATADIR%%/words.txt
>+@dirrm %%DATADIR%%
> @dirrmtry share/sounds
> @dirrmtry share/hunspell
>-@dirrm share/textroom

Actions: View | Diff

Attachments on bug 184893: 138814