4 files changed, 29 insertions, 24 deletions

diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 747eb80afa16..b06e4d989397 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtkyahoo
-PORTVERSION=	0.18.2
-PORTREVISION=	1
+PORTVERSION=	0.18.3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkyahoo
@@ -18,12 +17,15 @@ COMMENT=	Yahoo Messenger Client using GTK
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_BISON=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile"
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e '/@INSTALL@/s/$$INSTALL/${INSTALL}/' \
+		${WRKSRC}/libyahoo/configure
 
 .include <bsd.port.post.mk>
diff --git a/net-im/gtkyahoo/distinfo b/net-im/gtkyahoo/distinfo
index 11908d3c4c64..c1045d25da84 100644
--- a/net-im/gtkyahoo/distinfo
+++ b/net-im/gtkyahoo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkyahoo-0.18.2.tar.gz) = 7932ca979c41c7657791785813a9df79
-SHA256 (gtkyahoo-0.18.2.tar.gz) = b60148369d4ddfc5041d3d1265b420021e311684cfabfcc1591344e80dfffbad
-SIZE (gtkyahoo-0.18.2.tar.gz) = 300728
+MD5 (gtkyahoo-0.18.3.tar.gz) = d2e2b4a03f0f4c678d2f3b035e4b1e53
+SHA256 (gtkyahoo-0.18.3.tar.gz) = 17963a43219fc50cd69564eb35685459307f889dc41e6a2f067f234372537e23
+SIZE (gtkyahoo-0.18.3.tar.gz) = 422150
diff --git a/net-im/gtkyahoo/files/patch-rcfile.y b/net-im/gtkyahoo/files/patch-rcfile.y
index 59e9ae6b5cd8..0fcc390fd8aa 100644
--- a/net-im/gtkyahoo/files/patch-rcfile.y
+++ b/net-im/gtkyahoo/files/patch-rcfile.y
@@ -1,9 +1,9 @@
---- rcfile.y.orig	Sun Dec  1 22:51:31 2002
-+++ rcfile.y	Sun Dec  1 22:53:42 2002
-@@ -253,11 +253,13 @@
- 	| config_options idle_time_option
- 	| config_options show_notify_messages_option
+--- rcfile.y.orig	Tue Dec 18 14:41:08 2001
++++ rcfile.y	Fri Jan 20 21:05:00 2006
+@@ -261,11 +261,13 @@
  	| config_options display_real_names_option
+ 	| config_options show_chat_button_option
+ 	| config_options show_status_option
 +	;
  
  contact_options: /* empty */
@@ -14,7 +14,7 @@
  
  name_option: NAME QSTRING {
  		DBG_Print("rcfile", "[RC] Got contact name (%s)\n", $2);
-@@ -278,17 +280,14 @@
+@@ -286,17 +288,14 @@
      if ( images.status.away ) 
  	    free(images.status.away);
  	images.status.away = strdup($2); } 
@@ -32,7 +32,7 @@
      | IMAGE_STATUS_OFFLINE QSTRING { 	
      if ( images.status.offline ) 
  	    free(images.status.offline);
-@@ -327,7 +326,6 @@
+@@ -335,7 +334,6 @@
  			DBG_Print("rcfile", "[RC] Set proxy host to '%s'\n", $2);
  			proxy_host = strdup($2); }
  		}
diff --git a/net-im/gtkyahoo/pkg-plist b/net-im/gtkyahoo/pkg-plist
index f02855baeaf1..fba3f00e7273 100644
--- a/net-im/gtkyahoo/pkg-plist
+++ b/net-im/gtkyahoo/pkg-plist
@@ -4,14 +4,17 @@ include/libyahoo/libyahoo.h
 include/libyahoo/libyahoo-debug.h
 include/libyahoo/libyahoo-proto.h
 lib/libyahoo.a
+lib/libyahoo.so
+lib/libyahoo.so.0
+lib/libyahoo.la
 libexec/gtkyahoo-sound-handler
-share/gtkyahoo/sample.gtkyahoorc
-share/gtkyahoo/simple.gtkyahoorc
-share/gtkyahoo/sounds/beep.au
-share/gtkyahoo/sounds/logoff.au
-share/gtkyahoo/sounds/logon.au
-share/gtkyahoo/sounds/receive.au
-share/gtkyahoo/sounds/send.au
+%%DATADIR%%/sample.gtkyahoorc
+%%DATADIR%%/simple.gtkyahoorc
+%%DATADIR%%/sounds/beep.au
+%%DATADIR%%/sounds/logoff.au
+%%DATADIR%%/sounds/logon.au
+%%DATADIR%%/sounds/receive.au
+%%DATADIR%%/sounds/send.au
 @dirrm include/libyahoo
-@dirrm share/gtkyahoo/sounds
-@dirrm share/gtkyahoo
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%