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

(-)psi/Makefile (-20 / +10 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	psi
8
PORTNAME=	psi
9
PORTVERSION=	0.9.3
9
PORTVERSION=	0.10
10
PORTREVISION=	3
11
CATEGORIES=	net-im
10
CATEGORIES=	net-im
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 30-60 Link Here
30
		KDEDIR=${LOCALBASE}
29
		KDEDIR=${LOCALBASE}
31
CONFIGURE_ARGS=	--prefix=${PREFIX} --qtdir=${X11BASE} \
30
CONFIGURE_ARGS=	--prefix=${PREFIX} --qtdir=${X11BASE} \
32
		--with-qca-inc=${X11BASE}/include/plugins/qca \
31
		--with-qca-inc=${X11BASE}/include/plugins/qca \
33
		--with-qca-lib=${X11BASE}/lib
32
		--with-qca-lib=${X11BASE}/lib \
33
		--disable-growl --disable-dnotify --disable-ghbnr
34
MAKE_ARGS+=	QTDIR=${X11BASE} \
34
MAKE_ARGS+=	QTDIR=${X11BASE} \
35
		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
35
		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
36
36
37
OPTIONS=	KDE "Enable KDE tray support" off
37
PORTDOCS=	README ChangeLog
38
38
39
.include <bsd.port.pre.mk>
39
.include <bsd.port.pre.mk>
40
40
41
.if defined(WITH_KDE)
42
LIB_DEPENDS+=	kdecore:${PORTSDIR}/x11/kdelibs3
43
_NO_KDE_CONFTARGET_HACK=	yes
44
PLIST_SUB+=	KDE=""
45
.else
46
CONFIGURE_ARGS+=	--disable-kde
47
PLIST_SUB+=	KDE="@comment "
48
.endif
49
50
pre-install:
51
.if defined(WITH_KDE)
52
	@for size in 16x16 32x32 48x48; do \
53
	${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/apps; \
54
	done
55
.endif
56
57
post-install:
41
post-install:
58
	${STRIP_CMD} ${PREFIX}/bin/psi
42
	${STRIP_CMD} ${PREFIX}/bin/psi
43
.if !defined(NOPORTDOCS)
44
	@${MKDIR} ${DOCSDIR}
45
.for i in README ChangeLog
46
	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
47
.endfor
48
.endif
59
49
60
.include <bsd.port.post.mk>
50
.include <bsd.port.post.mk>
(-)psi/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (psi-0.9.3.tar.bz2) = d20f3bb530235a246bc2d92308089744
1
MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b
2
SHA256 (psi-0.9.3.tar.bz2) = e3ad2aedfdddfa045db2a55d6627b0412f24ac414c0f6c1e15f5448834439a00
2
SHA256 (psi-0.10.tar.bz2) = e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
3
SIZE (psi-0.9.3.tar.bz2) = 1423322
3
SIZE (psi-0.10.tar.bz2) = 1430929
(-)psi/files/patch-configure (-8 / +7 lines)
Lines 1-6 Link Here
1
--- configure.orig	Sat Nov 20 16:05:03 2004
1
--- configure.orig	Sun Jan  8 05:19:01 2006
2
+++ configure	Mon Mar 28 02:12:08 2005
2
+++ configure	Sat Feb  4 14:06:18 2006
3
@@ -94,6 +94,8 @@
3
@@ -192,6 +192,8 @@
4
 			shift
4
 			shift
5
 			;;
5
 			;;
6
 		--help) show_usage; exit ;;
6
 		--help) show_usage; exit ;;
Lines 9-30 Link Here
9
 		*) show_usage; exit ;;
9
 		*) show_usage; exit ;;
10
 	esac
10
 	esac
11
 done
11
 done
12
@@ -882,9 +884,14 @@
12
@@ -1055,9 +1057,13 @@
13
 			"}\n";
13
 			"}\n";
14
 
14
 
15
 		QString extra;
15
 		QString extra;
16
+		QString pthread_cflags = getenv("PTHREAD_CFLAGS");
16
+		QString pthread_cflags = getenv("PTHREAD_CFLAGS");
17
+		QString pthread_ldflags = getenv("PTHREAD_LDFLAGS");
17
+		QString pthread_ldflags = getenv("PTHREAD_LDFLAGS");
18
+
19
 		if(!path.isEmpty())
18
 		if(!path.isEmpty())
20
 			extra += QString("-L") + path + ' ';
19
 			extra += QString("-L") + path + ' ';
21
 		extra += QString("-l") + name;
20
 		extra += QString("-l") + name;
22
+		extra += ' ' + pthread_cflags + ' ' + pthread_ldflags + ' ';
21
+		extra += ' ' + pthread_cflags + ' ' + pthread_ldflags + ' ';
23
+
22
+		
24
 		if(!doCompileAndLink(str, extra))
23
 		if(!doCompileAndLink(str, extra))
25
 			return false;
24
 			return false;
26
 		return true;
25
 		return true;
27
@@ -1110,14 +1117,6 @@
26
@@ -1287,14 +1293,6 @@
28
 	echo
27
 	echo
29
 	exit 1;
28
 	exit 1;
30
 fi
29
 fi
Lines 38-41 Link Here
38
-rm -f Makefile.tmp
37
-rm -f Makefile.tmp
39
 
38
 
40
 echo
39
 echo
41
 echo Good, your configure finished.  Now run \'make\'.
40
 echo "Good, your configure finished.  Now run 'make'."
(-)psi/files/patch-src-ui_about.ui (-10 lines)
Lines 1-10 Link Here
1
--- src/ui_about.ui.orig	Tue Sep 27 21:37:27 2005
2
+++ src/ui_about.ui	Tue Sep 27 21:38:07 2005
3
@@ -334,7 +334,6 @@
4
 <layoutdefaults spacing="6" margin="11"/>
5
 <includehints>
6
     <includehint>fancylabel.h</includehint>
7
-    <includehint>urllabel.h</includehint>
8
     <includehint>psitextview.h</includehint>
9
     <includehint>psitextview.h</includehint>
10
     <includehint>psitextview.h</includehint>
(-)psi/files/patch-src_options-opt_appearance-ui.ui (-13 lines)
Lines 1-13 Link Here
1
--- src/options/opt_appearance-ui.ui.orig	Tue Sep 27 21:48:20 2005
2
+++ src/options/opt_appearance-ui.ui	Tue Sep 27 21:48:58 2005
3
@@ -457,10 +457,4 @@
4
     <tabstop>pb_fChat</tabstop>
5
 </tabstops>
6
 <layoutdefaults spacing="6" margin="11"/>
7
-<includehints>
8
-    <includehint>fontlabel.h</includehint>
9
-    <includehint>fontlabel.h</includehint>
10
-    <includehint>fontlabel.h</includehint>
11
-    <includehint>fontlabel.h</includehint>
12
-</includehints>
13
 </UI>
(-)psi/pkg-plist (-107 / +19 lines)
Lines 3-9 Link Here
3
%%DATADIR%%/README
3
%%DATADIR%%/README
4
%%DATADIR%%/certs/README
4
%%DATADIR%%/certs/README
5
%%DATADIR%%/certs/rootcert.xml
5
%%DATADIR%%/certs/rootcert.xml
6
%%DATADIR%%/designer/libpsiwidgets.so
7
%%DATADIR%%/iconsets/emoticons/README
6
%%DATADIR%%/iconsets/emoticons/README
8
%%DATADIR%%/iconsets/emoticons/default/angry.png
7
%%DATADIR%%/iconsets/emoticons/default/angry.png
9
%%DATADIR%%/iconsets/emoticons/default/bat.png
8
%%DATADIR%%/iconsets/emoticons/default/bat.png
Lines 44-61 Link Here
44
%%DATADIR%%/iconsets/emoticons/default/wink.png
43
%%DATADIR%%/iconsets/emoticons/default/wink.png
45
%%DATADIR%%/iconsets/emoticons/default/yes.png
44
%%DATADIR%%/iconsets/emoticons/default/yes.png
46
%%DATADIR%%/iconsets/roster/README
45
%%DATADIR%%/iconsets/roster/README
47
%%DATADIR%%/iconsets/roster/crystal_aim.jisp
46
%%DATADIR%%/iconsets/roster/crystal-aim.jisp
48
%%DATADIR%%/iconsets/roster/crystal_icq.jisp
47
%%DATADIR%%/iconsets/roster/crystal-gadu.jisp
49
%%DATADIR%%/iconsets/roster/crystal_msn.jisp
48
%%DATADIR%%/iconsets/roster/crystal-icq.jisp
50
%%DATADIR%%/iconsets/roster/crystal_roster.jisp
49
%%DATADIR%%/iconsets/roster/crystal-msn.jisp
51
%%DATADIR%%/iconsets/roster/crystal_transport.jisp
50
%%DATADIR%%/iconsets/roster/crystal-roster.jisp
52
%%DATADIR%%/iconsets/roster/crystal_yahoo.jisp
51
%%DATADIR%%/iconsets/roster/crystal-service.jisp
53
%%DATADIR%%/iconsets/roster/aim/away.png
52
%%DATADIR%%/iconsets/roster/crystal-sms.jisp
54
%%DATADIR%%/iconsets/roster/aim/dnd.png
53
%%DATADIR%%/iconsets/roster/crystal-yahoo.jisp
55
%%DATADIR%%/iconsets/roster/aim/icondef.xml
56
%%DATADIR%%/iconsets/roster/aim/offline.png
57
%%DATADIR%%/iconsets/roster/aim/online.png
58
%%DATADIR%%/iconsets/roster/aim/xa.png
59
%%DATADIR%%/iconsets/roster/default/ask.png
54
%%DATADIR%%/iconsets/roster/default/ask.png
60
%%DATADIR%%/iconsets/roster/default/away.png
55
%%DATADIR%%/iconsets/roster/default/away.png
61
%%DATADIR%%/iconsets/roster/default/chat.png
56
%%DATADIR%%/iconsets/roster/default/chat.png
Lines 76-144 Link Here
76
%%DATADIR%%/iconsets/roster/default/perr.png
71
%%DATADIR%%/iconsets/roster/default/perr.png
77
%%DATADIR%%/iconsets/roster/default/system.png
72
%%DATADIR%%/iconsets/roster/default/system.png
78
%%DATADIR%%/iconsets/roster/default/xa.png
73
%%DATADIR%%/iconsets/roster/default/xa.png
79
%%DATADIR%%/iconsets/roster/gadugadu/away.png
80
%%DATADIR%%/iconsets/roster/gadugadu/icondef.xml
81
%%DATADIR%%/iconsets/roster/gadugadu/invisible.png
82
%%DATADIR%%/iconsets/roster/gadugadu/offline.png
83
%%DATADIR%%/iconsets/roster/gadugadu/online.png
84
%%DATADIR%%/iconsets/roster/icq/away.png
85
%%DATADIR%%/iconsets/roster/icq/chat.png
86
%%DATADIR%%/iconsets/roster/icq/dnd.png
87
%%DATADIR%%/iconsets/roster/icq/icondef.xml
88
%%DATADIR%%/iconsets/roster/icq/invisible.png
89
%%DATADIR%%/iconsets/roster/icq/offline.png
90
%%DATADIR%%/iconsets/roster/icq/online.png
91
%%DATADIR%%/iconsets/roster/icq/xa.png
92
%%DATADIR%%/iconsets/roster/lightbulb/away.png
93
%%DATADIR%%/iconsets/roster/lightbulb/chat.png
94
%%DATADIR%%/iconsets/roster/lightbulb/dnd.png
95
%%DATADIR%%/iconsets/roster/lightbulb/ffc.png
96
%%DATADIR%%/iconsets/roster/lightbulb/groupclose.png
97
%%DATADIR%%/iconsets/roster/lightbulb/groupempty.png
98
%%DATADIR%%/iconsets/roster/lightbulb/groupopen.png
99
%%DATADIR%%/iconsets/roster/lightbulb/icondef.xml
100
%%DATADIR%%/iconsets/roster/lightbulb/invisible.png
101
%%DATADIR%%/iconsets/roster/lightbulb/message.png
102
%%DATADIR%%/iconsets/roster/lightbulb/offline.png
103
%%DATADIR%%/iconsets/roster/lightbulb/online.png
104
%%DATADIR%%/iconsets/roster/lightbulb/system.png
105
%%DATADIR%%/iconsets/roster/lightbulb/xa.png
106
%%DATADIR%%/iconsets/roster/msn/away.png
107
%%DATADIR%%/iconsets/roster/msn/dnd.png
108
%%DATADIR%%/iconsets/roster/msn/icondef.xml
109
%%DATADIR%%/iconsets/roster/msn/offline.png
110
%%DATADIR%%/iconsets/roster/msn/online.png
111
%%DATADIR%%/iconsets/roster/sms/away.png
112
%%DATADIR%%/iconsets/roster/sms/dnd.png
113
%%DATADIR%%/iconsets/roster/sms/icondef.xml
114
%%DATADIR%%/iconsets/roster/sms/offline.png
115
%%DATADIR%%/iconsets/roster/sms/online.png
116
%%DATADIR%%/iconsets/roster/sms/xa.png
117
%%DATADIR%%/iconsets/roster/stellar-icq/ask.png
118
%%DATADIR%%/iconsets/roster/stellar-icq/away.png
119
%%DATADIR%%/iconsets/roster/stellar-icq/dnd.png
120
%%DATADIR%%/iconsets/roster/stellar-icq/ffc.png
121
%%DATADIR%%/iconsets/roster/stellar-icq/icondef.xml
122
%%DATADIR%%/iconsets/roster/stellar-icq/invisible.png
123
%%DATADIR%%/iconsets/roster/stellar-icq/noauth.png
124
%%DATADIR%%/iconsets/roster/stellar-icq/offline.png
125
%%DATADIR%%/iconsets/roster/stellar-icq/online.png
126
%%DATADIR%%/iconsets/roster/stellar-icq/xa.png
127
%%DATADIR%%/iconsets/roster/transport/away.png
128
%%DATADIR%%/iconsets/roster/transport/dnd.png
129
%%DATADIR%%/iconsets/roster/transport/icondef.xml
130
%%DATADIR%%/iconsets/roster/transport/offline.png
131
%%DATADIR%%/iconsets/roster/transport/online.png
132
%%DATADIR%%/iconsets/roster/transport/xa.png
133
%%DATADIR%%/iconsets/roster/yahoo/away.png
134
%%DATADIR%%/iconsets/roster/yahoo/dnd.png
135
%%DATADIR%%/iconsets/roster/yahoo/icondef.xml
136
%%DATADIR%%/iconsets/roster/yahoo/offline.png
137
%%DATADIR%%/iconsets/roster/yahoo/online.png
138
%%DATADIR%%/iconsets/roster/yahoo/xa.png
139
%%DATADIR%%/iconsets/system/README
74
%%DATADIR%%/iconsets/system/README
140
%%DATADIR%%/iconsets/system/crystal_system.jisp
141
%%DATADIR%%/iconsets/system/default/account.png
75
%%DATADIR%%/iconsets/system/default/account.png
76
%%DATADIR%%/iconsets/system/default/advanced.png
77
%%DATADIR%%/iconsets/system/default/appearance.png
142
%%DATADIR%%/iconsets/system/default/add.png
78
%%DATADIR%%/iconsets/system/default/add.png
143
%%DATADIR%%/iconsets/system/default/arrow_down.png
79
%%DATADIR%%/iconsets/system/default/arrow_down.png
144
%%DATADIR%%/iconsets/system/default/arrow_left.png
80
%%DATADIR%%/iconsets/system/default/arrow_left.png
Lines 149-164 Link Here
149
%%DATADIR%%/iconsets/system/default/changeacc.png
85
%%DATADIR%%/iconsets/system/default/changeacc.png
150
%%DATADIR%%/iconsets/system/default/chatclear.png
86
%%DATADIR%%/iconsets/system/default/chatclear.png
151
%%DATADIR%%/iconsets/system/default/close.png
87
%%DATADIR%%/iconsets/system/default/close.png
88
%%DATADIR%%/iconsets/system/default/closetab.png
152
%%DATADIR%%/iconsets/system/default/configure_toolbars.png
89
%%DATADIR%%/iconsets/system/default/configure_toolbars.png
153
%%DATADIR%%/iconsets/system/default/download.png
90
%%DATADIR%%/iconsets/system/default/download.png
154
%%DATADIR%%/iconsets/system/default/edit.png
91
%%DATADIR%%/iconsets/system/default/disco.png
155
%%DATADIR%%/iconsets/system/default/editclear.png
156
%%DATADIR%%/iconsets/system/default/editcopy.png
157
%%DATADIR%%/iconsets/system/default/editcut.png
158
%%DATADIR%%/iconsets/system/default/editdelete.png
159
%%DATADIR%%/iconsets/system/default/editpaste.png
160
%%DATADIR%%/iconsets/system/default/edittrash.png
161
%%DATADIR%%/iconsets/system/default/eye_blue.png
92
%%DATADIR%%/iconsets/system/default/eye_blue.png
93
%%DATADIR%%/iconsets/system/default/events.png
162
%%DATADIR%%/iconsets/system/default/filemanager.png
94
%%DATADIR%%/iconsets/system/default/filemanager.png
163
%%DATADIR%%/iconsets/system/default/groupchat.png
95
%%DATADIR%%/iconsets/system/default/groupchat.png
164
%%DATADIR%%/iconsets/system/default/help.png
96
%%DATADIR%%/iconsets/system/default/help.png
Lines 171-177 Link Here
171
%%DATADIR%%/iconsets/system/default/info.png
103
%%DATADIR%%/iconsets/system/default/info.png
172
%%DATADIR%%/iconsets/system/default/jabber.png
104
%%DATADIR%%/iconsets/system/default/jabber.png
173
%%DATADIR%%/iconsets/system/default/key.png
105
%%DATADIR%%/iconsets/system/default/key.png
174
%%DATADIR%%/iconsets/system/default/key2.png
175
%%DATADIR%%/iconsets/system/default/key_bad.png
106
%%DATADIR%%/iconsets/system/default/key_bad.png
176
%%DATADIR%%/iconsets/system/default/key_unknown.png
107
%%DATADIR%%/iconsets/system/default/key_unknown.png
177
%%DATADIR%%/iconsets/system/default/ok.png
108
%%DATADIR%%/iconsets/system/default/ok.png
Lines 187-192 Link Here
187
%%DATADIR%%/iconsets/system/default/remove.png
118
%%DATADIR%%/iconsets/system/default/remove.png
188
%%DATADIR%%/iconsets/system/default/search.png
119
%%DATADIR%%/iconsets/system/default/search.png
189
%%DATADIR%%/iconsets/system/default/send.png
120
%%DATADIR%%/iconsets/system/default/send.png
121
%%DATADIR%%/iconsets/system/default/self.png
122
%%DATADIR%%/iconsets/system/default/show_away.png
123
%%DATADIR%%/iconsets/system/default/show_hidden.png
124
%%DATADIR%%/iconsets/system/default/show_offline.png
125
%%DATADIR%%/iconsets/system/default/start-chat.png
126
%%DATADIR%%/iconsets/system/default/status.png
190
%%DATADIR%%/iconsets/system/default/smile.png
127
%%DATADIR%%/iconsets/system/default/smile.png
191
%%DATADIR%%/iconsets/system/default/ssl_no.png
128
%%DATADIR%%/iconsets/system/default/ssl_no.png
192
%%DATADIR%%/iconsets/system/default/ssl_yes.png
129
%%DATADIR%%/iconsets/system/default/ssl_yes.png
Lines 224-258 Link Here
224
@dirrm %%DATADIR%%/iconsets/system/default/clients
161
@dirrm %%DATADIR%%/iconsets/system/default/clients
225
@dirrm %%DATADIR%%/iconsets/system/default
162
@dirrm %%DATADIR%%/iconsets/system/default
226
@dirrm %%DATADIR%%/iconsets/system
163
@dirrm %%DATADIR%%/iconsets/system
227
@dirrm %%DATADIR%%/iconsets/roster/yahoo
228
@dirrm %%DATADIR%%/iconsets/roster/transport
229
@dirrm %%DATADIR%%/iconsets/roster/stellar-icq
230
@dirrm %%DATADIR%%/iconsets/roster/sms
231
@dirrm %%DATADIR%%/iconsets/roster/msn
232
@dirrm %%DATADIR%%/iconsets/roster/lightbulb
233
@dirrm %%DATADIR%%/iconsets/roster/icq
234
@dirrm %%DATADIR%%/iconsets/roster/gadugadu
235
@dirrm %%DATADIR%%/iconsets/roster/default
164
@dirrm %%DATADIR%%/iconsets/roster/default
236
@dirrm %%DATADIR%%/iconsets/roster/aim
237
@dirrm %%DATADIR%%/iconsets/roster
165
@dirrm %%DATADIR%%/iconsets/roster
238
@dirrm %%DATADIR%%/iconsets/emoticons/default
166
@dirrm %%DATADIR%%/iconsets/emoticons/default
239
@dirrm %%DATADIR%%/iconsets/emoticons
167
@dirrm %%DATADIR%%/iconsets/emoticons
240
@dirrm %%DATADIR%%/iconsets
168
@dirrm %%DATADIR%%/iconsets
241
@dirrm %%DATADIR%%/designer
242
@dirrm %%DATADIR%%/certs
169
@dirrm %%DATADIR%%/certs
243
@dirrm %%DATADIR%%
170
@dirrm %%DATADIR%%
244
%%KDE%%@cwd %%LOCALBASE%%
245
%%KDE%%share/applnk/Internet/psi.desktop
246
%%KDE%%share/icons/hicolor/16x16/apps/psi.png
247
%%KDE%%share/icons/hicolor/32x32/apps/psi.png
248
%%KDE%%share/icons/hicolor/48x48/apps/psi.png
249
%%KDE%%@dirrmtry share/applnk/Internet
250
%%KDE%%@dirrmtry share/applnk
251
%%KDE%%@dirrmtry share/icons/hicolor/16x16/apps
252
%%KDE%%@dirrmtry share/icons/hicolor/16x16
253
%%KDE%%@dirrmtry share/icons/hicolor/32x32/apps
254
%%KDE%%@dirrmtry share/icons/hicolor/32x32
255
%%KDE%%@dirrmtry share/icons/hicolor/48x48/apps
256
%%KDE%%@dirrmtry share/icons/hicolor/48x48
257
%%KDE%%@dirrmtry share/icons/hicolor
258
%%KDE%%@dirrmtry share/icons

Return to bug 92793