3 files changed, 36 insertions, 16 deletions

diff --git a/net-im/aim/Makefile b/net-im/aim/Makefile
index c6489635aa4f..f6882bb0977f 100644
--- a/net-im/aim/Makefile
+++ b/net-im/aim/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	aim
-PORTVERSION=	1.5.234
+PORTVERSION=	1.5.286
 CATEGORIES=	net linux
-MASTER_SITES=	ftp://ftp.newaol.com/aimgen/73010/
-DISTNAME=	aim-${PORTVERSION}-1
-EXTRACT_SUFX=	.i386.tgz
+MASTER_SITES=	ftp://ftp.newaol.com/aimgen/380469/
+DISTNAME=	aim-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	p9711422@mmu.edu.my
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	AOL's Instant Messenger (AIM) client
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
@@ -23,15 +23,23 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_XLIB=	yes
 
-# This port will only work when PREFIX is /usr/local because the aim
-# program is hard coded to look for important files in /usr/local/lib/aim
-PREFIX=		/usr/local
+# must not strip
+STRIP=
 
 do-install:
-	${CP} ${WRKSRC}/usr/local/bin/aim ${PREFIX}/bin
-	${CP} ${WRKSRC}/usr/local/lib/lib* ${PREFIX}/lib
-	${MKDIR} ${PREFIX}/lib/aim
-	${CP} -R ${WRKSRC}/usr/local/lib/aim/* ${PREFIX}/lib/aim
-	${RM} -rf ${PREFIX}/lib/aim/source
+	${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/aim ${PREFIX}/libexec
+	(cd ${WRKSRC}/usr/lib;exec ${TAR} --exclude aim/source -cf - *)|(cd ${PREFIX}/lib;exec ${TAR} -xpf -)
+	@{ECHO_CMD} "#!/bin/sh" >${PREFIX}/bin/aim
+	@{ECHO_CMD} "ulimit -Sc 0" >>${PREFIX}/bin/aim
+	@{ECHO_CMD} -n "exec ${PREFIX}/libexec/aim --install_dir ${PREFIX}/lib/aim" >>${PREFIX}/bin/aim
+	@{ECHO_CMD} ' "$$@"' >>${PREFIX}/bin/aim
+	${CHMOD} ${BINMODE} ${PREFIX}/bin/aim
+
+post-install:
+.if !exists(/compat/linux/usr/bin/esdplay) && !exists(${PREFIX}/bin/esdplay)
+	@${ECHO_MSG} "-----------------------------------------------------------------"
+	@${ECHO_MSG} "Install audio/linux-esound or disable Sounds in aim's Preferences"
+	@${ECHO_MSG} "-----------------------------------------------------------------"
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-im/aim/distinfo b/net-im/aim/distinfo
index fc208185547e..2321d8a2ca45 100644
--- a/net-im/aim/distinfo
+++ b/net-im/aim/distinfo
@@ -1 +1 @@
-MD5 (aim-1.5.234-1.i386.tgz) = 44e2a45af8ef654a99e7deb88f577d03
+MD5 (aim-1.5.286.tgz) = c724e43269e31947e4aa0fec3b4d5e50
diff --git a/net-im/aim/pkg-plist b/net-im/aim/pkg-plist
index 71e76245f66e..71c2df2370c2 100644
--- a/net-im/aim/pkg-plist
+++ b/net-im/aim/pkg-plist
@@ -6,11 +6,15 @@ lib/libXprt.so.1
 lib/libXptl.so
 lib/libXptl.so.1
 lib/libextgtk.so
-lib/libextgtk.so.1      
+lib/libextgtk.so.1
 lib/aim/CoolBos.so
 lib/aim/CoolBos.so.1
 lib/aim/CoolBucky.so
 lib/aim/CoolBucky.so.1
+lib/aim/CoolHttp.so
+lib/aim/CoolHttp.so.1
+lib/aim/CoolPeer.so
+lib/aim/CoolPeer.so.1
 lib/aim/CoolSocket.so
 lib/aim/CoolSocket.so.1
 lib/aim/CoolSos.so
@@ -101,7 +105,6 @@ lib/aim/help/signing_on.htm
 lib/aim/help/sounds_prefs.htm
 lib/aim/help/turning_an_away.htm
 lib/aim/help/uninstalling.htm
-lib/aim/help/images/BL.gif
 lib/aim/help/images/add_buddy.gif
 lib/aim/help/images/aimheaderleft.gif
 lib/aim/help/images/away.gif
@@ -111,11 +114,20 @@ lib/aim/help/images/chat_message.gif
 lib/aim/help/images/chat_message2.gif
 lib/aim/help/images/im.gif
 lib/aim/help/images/sign_on.gif
+lib/aim/sounds/cashregister.wav
 lib/aim/sounds/dooropen.wav
 lib/aim/sounds/doorslam.wav
 lib/aim/sounds/imrcv.wav
 lib/aim/sounds/imsend.wav
+lib/aim/sounds/moo.wav
+lib/aim/sounds/newalert.wav
+lib/aim/sounds/newmail.wav
+lib/aim/sounds/phone.wav
 lib/aim/sounds/ring.wav
+lib/aim/sounds/talkbeg.wav
+lib/aim/sounds/talkend.wav
+lib/aim/sounds/talkstop.wav
+libexec/aim
 @dirrm lib/aim/extra
 @dirrm lib/aim/help/images
 @dirrm lib/aim/help