5 files changed, 39 insertions, 22 deletions

diff --git a/net-im/ymessenger/Makefile b/net-im/ymessenger/Makefile
index 2940e61f4249..d94e647951bd 100644
--- a/net-im/ymessenger/Makefile
+++ b/net-im/ymessenger/Makefile
@@ -8,11 +8,11 @@
 
 PORTNAME=	ymessenger
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	20020902
 CATEGORIES=	net-im
 MASTER_SITES=	http://public.yahoo.com/~mmk/
-DISTNAME=	fbsd4.${PORTNAME}
+DISTNAME=	fbsd5.${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sethk@meowfishies.com
@@ -25,32 +25,39 @@ NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000
-LIB_DEPENDS+=    c.4:${PORTSDIR}/misc/compat4x
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+.endif
+
+.if ${OSVERSION} < 500000
+IGNORE=		does not run on FreeBSD 4.x
 .endif
 
 ONLY_FOR_ARCHS=	i386
 
 GETTEXT_MAJOR=	6
 
+post-patch:
+	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKDIR}/bin/ymessenger
+	@${CHMOD} +w ${WRKDIR}/share/ymessenger/ymessenger.bin
+	${ECHO} ${GETTEXT_MAJOR} | dd bs=1 count=1 conv=notrunc seek=43202 \
+		of=${WRKDIR}/share/ymessenger/ymessenger.bin
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bin/ymessenger ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/ymessenger
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/ymessenger.bin \
+	${INSTALL_PROGRAM} ${WRKDIR}/share/ymessenger/ymessenger.bin \
 		${PREFIX}/libexec/ymessenger
 	@(set -x; for i in yahoo_gnome.png yahoo_kde.xpm \
 		ymessenger.desktop ymessenger.kdelnk; do \
-	    ${INSTALL_DATA} ${WRKDIR}/bin/$$i \
+	    ${INSTALL_DATA} ${WRKDIR}/share/ymessenger/$$i \
 		    ${PREFIX}/libexec/ymessenger; \
 	    done)
 	${MKDIR} ${PREFIX}/lib/ymessenger
-	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.0 \
+	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.6 \
 		${PREFIX}/lib/ymessenger/
 
-post-patch:
-	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKDIR}/bin/ymessenger
-	@${CHMOD} +w ${WRKDIR}/bin/ymessenger.bin
-	${ECHO} ${GETTEXT_MAJOR} | dd bs=1 count=1 conv=notrunc seek=43202 \
-		of=${WRKDIR}/bin/ymessenger.bin
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ymessenger/distinfo b/net-im/ymessenger/distinfo
index 615a7658f7c4..7b6883a12f9a 100644
--- a/net-im/ymessenger/distinfo
+++ b/net-im/ymessenger/distinfo
@@ -1,3 +1,4 @@
-MD5 (fbsd4.ymessenger.tgz) = 0b9da16fc58cf6072961f1fe197b1e41
-SHA256 (fbsd4.ymessenger.tgz) = 63e284c04c19625cec074794684dbb6a9eff05c9b811f41e58172caaa685ed9e
+MD5 (fbsd5.ymessenger.tgz) = d46390ff26cf5d01767d92efabecfc7e
+SHA256 (fbsd5.ymessenger.tgz) = 5a9b5d1fcc854b83567402ff67ad6dad0000c4c912d72f68c30352447578ef15
+SIZE (fbsd5.ymessenger.tgz) = 686647
 SIZE (fbsd4.ymessenger.tgz) = 933244
diff --git a/net-im/ymessenger/files/patch-ymessenger b/net-im/ymessenger/files/patch-ymessenger
index 5faad22cc9ac..d17fb2c0316a 100644
--- a/net-im/ymessenger/files/patch-ymessenger
+++ b/net-im/ymessenger/files/patch-ymessenger
@@ -1,11 +1,10 @@
---- bin/ymessenger.orig	Mon May  6 23:06:27 2002
-+++ bin/ymessenger	Sat Aug 30 03:09:58 2003
-@@ -1,4 +1,5 @@
+--- bin/ymessenger.orig	Fri Oct  3 21:02:12 2003
++++ bin/ymessenger	Sat Jan  7 14:42:37 2006
+@@ -1,4 +1,4 @@
  #!/bin/sh
--LD_LIBRARY_PATH=/opt/ymessenger/lib:$LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 -export LD_LIBRARY_PATH
--exec /opt/ymessenger/bin/ymessenger.bin $@
-+LD_LIBRARY_PATH=%%PREFIX%%/lib/ymessenger:$LD_LIBRARY_PATH
-+LD_PRELOAD=/usr/lib/libc_r.so:/usr/lib/libc.so
+-exec /usr/local/share/ymessenger/ymessenger.bin $@
++LD_LIBRARY_PATH=%%PREFIX%%/lib:$LD_LIBRARY_PATH
 +export LD_LIBRARY_PATH LD_PRELOAD
 +exec %%PREFIX%%/libexec/ymessenger/ymessenger.bin $@
diff --git a/net-im/ymessenger/pkg-message b/net-im/ymessenger/pkg-message
new file mode 100644
index 000000000000..666a4234859c
--- /dev/null
+++ b/net-im/ymessenger/pkg-message
@@ -0,0 +1,10 @@
+****** Post-installation instructions: How to run Yahoo Messenger ******
+
+In order to run ymessenger, you must add the following entries
+to /etc/libmap.conf:
+
+[ymessenger.bin]
+libgtkhtml.so.6 ymessenger/libgtkhtml.so.6
+libintl.so.4    libintl.so.6
+
+************************************************************************
diff --git a/net-im/ymessenger/pkg-plist b/net-im/ymessenger/pkg-plist
index acfb65c6e5b4..660a0483b9f7 100644
--- a/net-im/ymessenger/pkg-plist
+++ b/net-im/ymessenger/pkg-plist
@@ -4,6 +4,6 @@ libexec/ymessenger/yahoo_gnome.png
 libexec/ymessenger/yahoo_kde.xpm
 libexec/ymessenger/ymessenger.desktop
 libexec/ymessenger/ymessenger.kdelnk
-lib/ymessenger/libgtkhtml.so.0
+lib/ymessenger/libgtkhtml.so.6
 @dirrm lib/ymessenger
 @dirrm libexec/ymessenger