Attachment #138814 for bug #184893

View | Details | Raw Unified | Return to bug 184893
Collapse All | Expand All





PORTNAME=	textroom
PORTVERSION=	0.8.2
PORTREVISION=	5
CATEGORIES=	editors
MASTER_SITES=	SF

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Full screen text editor

LICENSE=	GPLv3
		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
		libcurl.so:${PORTSDIR}/ftp/curl

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 opengl qt3support svg xml
QMAKE_ARGS=	LOCALBASE=${LOCALBASE}

post-patch:
.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>




--- application/application.pro.orig	2011-01-22 03:25:20.000000000 +0100
+++ application/application.pro	2011-02-10 21:37:18.000000000 +0100
@@ -4,20 +4,16 @@
     src \
     ui
 
-linux-g++ {
+unix {
 	INCLUDEPATH += . \
 	    src \
-	    src/include \
-	    /usr/include \
-	    /usr/include/hunspell \
-	    /usr/include/libxml++-2.6 \

-	    /usr/lib/glib-2.0/include \
-	    /usr/lib/libxml++-2.6/include \
-	    /usr/include/SDL
-	
+	    src/include
+	PKGCONFIG += \
+	    glib-2.0 \
+	    hunspell \
+	    libcurl \
+	    libxml++-2.6 \
+	    SDL_mixer
+	    $$LOCALBASE/lib/libxml++-2.6/include \
+	    $$LOCALBASE/include/SDL
 	
 }
 
 macx {
@@ -85,40 +81,33 @@
     src/asciireporter.cpp
 RESOURCES += resource/textroom.qrc \
 	resource/images/icons-app.qrc 
-linux-g++ {
+unix {
     CONFIG += release \
+        link_pkgconfig \
         build_all
     INSTALLS += data \
         dict \
         target \
         desktop \
-        uninstaller \
         mime \
 	words \
         icon
-    LIBS = -lSDL_mixer \
-	-lSDL \
-        -lhunspell \
-	-lglibmm-2.4 \
-	-lcurl \
-	-lxml++-2.6 \
+    LIBS = \
 	$$TOPDIR/lib/libflo.a
-    data.path = /usr/share/sounds
+    data.path = $$PREFIX/share/sounds

+    mime.path = $$PREFIX/share/textroom
     mime.files = resource/desktop/textroom-txr-mime.xml
-    uninstaller.path = /usr/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/*




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

Return to bug 184893

Lines 3-29 Link Here

(-)editors/textroom/Makefile (-12 / +17 lines)
3		3
4	PORTNAME= textroom	4	PORTNAME= textroom
5	PORTVERSION= 0.8.2	5	PORTVERSION= 0.8.2
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= editors	7	CATEGORIES= editors
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Full screen text editor	11	COMMENT= Full screen text editor
12		12
13	LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \	13	LICENSE= GPLv3
14	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
15	libcurl.so:${PORTSDIR}/ftp/curl
16		14
17	USES= qmake shared-mime-info	15	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
		16	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
		17	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
		18
		19	USES= desktop-file-utils pkgconfig qmake
		20	USE_GL= gl
18	USE_SDL= mixer	21	USE_SDL= mixer
19	USE_QT4= moc_build rcc_build uic_build corelib gui xml \	22	USE_QT4= moc_build rcc_build uic_build \
20	svg opengl qt3support	23	corelib gui opengl qt3support svg xml
21	QMAKE_ARGS= LOCALBASE=${LOCALBASE}
22		24
23	post-patch:	25	post-patch:
24	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' \	26	.for i in getaword.cpp optionsdialog.cpp textroom.cpp
25	${WRKSRC}/application/src/textroom.cpp \	27	@${REINPLACE_CMD} -e \
26	${WRKSRC}/application/src/getaword.cpp \	28	's\|/usr/share\|${PREFIX}/share\|' ${WRKSRC}/application/src/${i}
27	${WRKSRC}/application/src/optionsdialog.cpp	29	.endfor
		30
		31	post-install:
		32	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/textroom
28		33
29	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)editors/textroom/files/patch-application_application.pro (-25 / +28 lines)
1	--- application/application.pro.orig 2011-01-22 03:25:20.000000000 +0100	1	--- application/application.pro.orig 2011-01-22 03:25:20.000000000 +0100
2	+++ application/application.pro 2011-02-10 21:37:18.000000000 +0100	2	+++ application/application.pro 2011-02-10 21:37:18.000000000 +0100
3	@@ -4,19 +4,20 @@	3	@@ -4,20 +4,16 @@
4	src \	4	src \
5	ui	5	ui
6		6
7	-linux-g++ {	7	-linux-g++ {
8	+freebsd-g++ {	8	+unix {
9	INCLUDEPATH += . \	9	INCLUDEPATH += . \
10	src \	10	src \
11	src/include \	11	- src/include \
12	- /usr/include \	12	- /usr/include \
13	- /usr/include/hunspell \	13	- /usr/include/hunspell \
14	- /usr/include/libxml++-2.6 \	14	- /usr/include/libxml++-2.6 \
Lines 18-54 Link Here
18	- /usr/lib/glib-2.0/include \	18	- /usr/lib/glib-2.0/include \
19	- /usr/lib/libxml++-2.6/include \	19	- /usr/lib/libxml++-2.6/include \
20	- /usr/include/SDL	20	- /usr/include/SDL
21	+ $$LOCALBASE/include \	21	-
22	+ $$LOCALBASE/include/hunspell \	22	+ src/include
23	+ $$LOCALBASE/include/libxml++-2.6 \	23	+ PKGCONFIG += \
24	+ $$LOCALBASE/include//libxml++-2.6/include \	24	+ glib-2.0 \
25	+ $$LOCALBASE/include/glibmm-2.4 \	25	+ hunspell \
26	+ $$LOCALBASE/lib/glibmm-2.4/include \	26	+ libcurl \
27	+ $$LOCALBASE/include/glib-2.0 \	27	+ libxml++-2.6 \
28	+ $$LOCALBASE/lib/glib-2.0/include \	28	+ SDL_mixer
29	+ $$LOCALBASE/lib/libxml++-2.6/include \
30	+ $$LOCALBASE/include/SDL
31
32	}	29	}
33		30
34	@@ -85,7 +86,7 @@	31	macx {
		32	@@ -85,40 +81,33 @@
35	src/asciireporter.cpp	33	src/asciireporter.cpp
36	RESOURCES += resource/textroom.qrc \	34	RESOURCES += resource/textroom.qrc \
37	resource/images/icons-app.qrc	35	resource/images/icons-app.qrc
38	-linux-g++ {	36	-linux-g++ {
39	+freebsd-g++ {	37	+unix {
40	CONFIG += release \	38	CONFIG += release \
		39	+ link_pkgconfig \
41	build_all	40	build_all
42	INSTALLS += data \	41	INSTALLS += data \
43	@@ -98,27 +99,27 @@	42	dict \
		43	target \
		44	desktop \
		45	- uninstaller \
		46	mime \
		47	words \
44	icon	48	icon
45	LIBS = -lSDL_mixer \	49	- LIBS = -lSDL_mixer \
46	-lSDL \	50	- -lSDL \
47	- -lhunspell \	51	- -lhunspell \
48	+ -lhunspell-1.3 \	52	- -lglibmm-2.4 \
49	-lglibmm-2.4 \	53	- -lcurl \
50	-lcurl \	54	- -lxml++-2.6 \
51	-lxml++-2.6 \	55	+ LIBS = \
52	$$TOPDIR/lib/libflo.a	56	$$TOPDIR/lib/libflo.a
53	- data.path = /usr/share/sounds	57	- data.path = /usr/share/sounds
54	+ data.path = $$PREFIX/share/sounds	58	+ data.path = $$PREFIX/share/sounds
Lines 68-75 Link Here
68	+ mime.path = $$PREFIX/share/textroom	72	+ mime.path = $$PREFIX/share/textroom
69	mime.files = resource/desktop/textroom-txr-mime.xml	73	mime.files = resource/desktop/textroom-txr-mime.xml
70	- uninstaller.path = /usr/bin	74	- uninstaller.path = /usr/bin
71	+ uninstaller.path = $$PREFIX/bin	75	- uninstaller.files = resource/desktop/textroom-uninstall
72	uninstaller.files = resource/desktop/textroom-uninstall
73	- dict.path = /usr/share/hunspell	76	- dict.path = /usr/share/hunspell
74	+ dict.path = $$PREFIX/share/hunspell	77	+ dict.path = $$PREFIX/share/hunspell
75	dict.files = resource/dict/*	78	dict.files = resource/dict/*

Lines 1-13 Link Here

(-)editors/textroom/pkg-plist (-4 / +3 lines)
1	bin/textroom	1	bin/textroom
2	bin/textroom-uninstall
3	share/applications/textroom.desktop	2	share/applications/textroom.desktop
4	share/textroom/textroom-txr-mime.xml
5	share/textroom/words.txt
6	share/hunspell/tr.aff	3	share/hunspell/tr.aff
7	share/hunspell/tr.dic	4	share/hunspell/tr.dic
8	share/pixmaps/textroom.png	5	share/pixmaps/textroom.png
9	share/sounds/keyany.wav	6	share/sounds/keyany.wav
10	share/sounds/keyenter.wav	7	share/sounds/keyenter.wav
		8	%%DATADIR%%/textroom-txr-mime.xml
		9	%%DATADIR%%/words.txt
		10	@dirrm %%DATADIR%%
11	@dirrmtry share/sounds	11	@dirrmtry share/sounds
12	@dirrmtry share/hunspell	12	@dirrmtry share/hunspell
13	@dirrm share/textroom