5 files changed, 12 insertions, 66 deletions

diff --git a/net-im/bsflite/Makefile b/net-im/bsflite/Makefile
index ecf2a7573140..3e6ff5dc1829 100644
--- a/net-im/bsflite/Makefile
+++ b/net-im/bsflite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bsflite
-DISTVERSION=	0.80
+DISTVERSION=	0.81
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=bsflite
@@ -16,24 +16,14 @@ COMMENT=	A lightweight command line AIM client
 
 USE_REINPLACE=	yes
 
-OSCAR_PORT?=	5190
+PLIST_FILES=	bin/bsflite %%EXAMPLESDIR%%/config-example
+PLIST_DIRS=	%%EXAMPLESDIR%%
+PORTDOCS=	COPYING ChangeLog README
 
-.include <bsd.port.pre.mk>
-
-.if ${OSCAR_PORT} == "5190"
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Note:"
-	@${ECHO_MSG} "If you're behind a firewall you might want to set OSCAR_PORT"
-	@${ECHO_MSG} "a port other than ${OSCAR_PORT}."
-	@${ECHO_MSG} ""
-.endif
-
-.if ${OSCAR_PORT} != 5190
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(#define OSCAR_PORT\) 5190|\1 ${OSCAR_PORT}|' \
-		${WRKSRC}/imcomm/imcomm.h
-.endif
+	@${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' \
+		${WRKSRC}/${MAKEFILE} \
+		${WRKSRC}/imcomm/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bsflite ${PREFIX}/bin
@@ -42,9 +32,9 @@ do-install:
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for f in COPYING ChangeLog README
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/bsflite/distinfo b/net-im/bsflite/distinfo
index 82c4e5fecec9..52f3949f19fe 100644
--- a/net-im/bsflite/distinfo
+++ b/net-im/bsflite/distinfo
@@ -1,3 +1,3 @@
-MD5 (bsflite-0.80.tar.gz) = 31589a230e4ccfaae1225d080d3b7d6d
-SHA256 (bsflite-0.80.tar.gz) = 92202f5a29945a324bedba493dacd04f7029149fb0984d36d95914b407f06bcb
-SIZE (bsflite-0.80.tar.gz) = 50529
+MD5 (bsflite-0.81.tar.gz) = d5ef0c9e5a544671d9af1db4ee7666b2
+SHA256 (bsflite-0.81.tar.gz) = eb3416191bb1eb8d86658b0430d65336c38079761abcee3c05d99d4c6fcbed07
+SIZE (bsflite-0.81.tar.gz) = 55488
diff --git a/net-im/bsflite/files/patch-Makefile b/net-im/bsflite/files/patch-Makefile
deleted file mode 100644
index 85c194f80130..000000000000
--- a/net-im/bsflite/files/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Mon Jun  6 02:49:25 2005
-+++ Makefile	Mon Jun  6 02:49:41 2005
-@@ -2,7 +2,6 @@
- #EXEC=bsflite.exe
- #CC=i386-pc-msdosdjgpp-gcc
- #CC=mingw32-gcc
--CC=gcc
- #
- # Remove -DTIMESTAMPS to remove timestamps on messages/events
- #
-@@ -18,7 +17,7 @@
- # Add -DBELL_ON_INCOMING to sound an alert when a message
- # 	comes in.
- # 	
--CFLAGS=-O -DTIMESTAMPS
-+CFLAGS+=-DTIMESTAMPS
- #CFLAGS+=-I/usr/local/djgpp/watt/inc
- #
- # Add -lsocket -lnsl for Solaris
diff --git a/net-im/bsflite/files/patch-imcomm::Makefile b/net-im/bsflite/files/patch-imcomm::Makefile
deleted file mode 100644
index 385f7176a0d8..000000000000
--- a/net-im/bsflite/files/patch-imcomm::Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- imcomm/Makefile.orig	Mon Jun  6 02:49:47 2005
-+++ imcomm/Makefile	Mon Jun  6 02:50:17 2005
-@@ -1,15 +1,11 @@
- EXEC=test
- #AR=i386-pc-msdosdjgpp-ar
- #AR=mingw32-ar
--AR=ar
- #RANLIB=i386-pc-msdosdjgpp-ranlib
- #RANLIB=mingw32-ranlib
--RANLIB=ranlib
- LIB=libimcomm.a
- #CC=i386-pc-msdosdjgpp-gcc
- #CC=mingw32-gcc
--CC=gcc
--CFLAGS=-O
- RM=rm -f
- #CFLAGS+=-I/usr/local/djgpp/watt/inc
- #
diff --git a/net-im/bsflite/pkg-plist b/net-im/bsflite/pkg-plist
deleted file mode 100644
index 326de7ec6975..000000000000
--- a/net-im/bsflite/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/bsflite
-%%EXAMPLESDIR%%/config-example
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%