5 files changed, 26 insertions, 32 deletions

diff --git a/news/slrnface/Makefile b/news/slrnface/Makefile
index 15528bb9a5cb..76d799f5b604 100644
--- a/news/slrnface/Makefile
+++ b/news/slrnface/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	slrnface
-PORTVERSION=	1.2
+PORTVERSION=	2.1.1
 CATEGORIES=	news
-MASTER_SITES=	http://fly.cc.fer.hr/~dave/slrnface/
+MASTER_SITES=	http://dave.willfork.com/slrnface/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	stolz@i2.informatik.rwth-aachen.de
 
 LIB_DEPENDS=	compface:${PORTSDIR}/mail/faces
 
 ALL_TARGET=	slrnface
 
 USE_XLIB=	yes
-USE_GMAKE=	yes
 
-post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile
+MAN1=		slrnface.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/slrnface ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/slrnface.1 ${MAN1PREFIX}/man/man1/slrnface.1
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/slrnface.sl ${EXAMPLESDIR}
 	@${CAT} ${PKGMESSAGE}
diff --git a/news/slrnface/distinfo b/news/slrnface/distinfo
index 4d3f40651619..0c390dc19cda 100644
--- a/news/slrnface/distinfo
+++ b/news/slrnface/distinfo
@@ -1 +1 @@
-MD5 (slrnface-1.2.tar.gz) = 71c39b70c89c715970c29378b71ecf9e
+MD5 (slrnface-2.1.1.tar.gz) = a28c21396f8f759beece8e583f979bf9
diff --git a/news/slrnface/files/patch-Makefile b/news/slrnface/files/patch-Makefile
index 047bb3be7ae1..423390c500d1 100644
--- a/news/slrnface/files/patch-Makefile
+++ b/news/slrnface/files/patch-Makefile
@@ -1,20 +1,29 @@
---- Makefile.orig	Mon Dec 25 02:38:17 2000
-+++ Makefile	Thu Aug 22 21:28:44 2002
-@@ -1,13 +1,12 @@
+--- Makefile.orig	Sat Aug 24 23:56:21 2002
++++ Makefile	Fri Sep  6 14:46:38 2002
+@@ -1,21 +1,19 @@
 -CC = cc
+-
 -X_INCL = # location of X include files, if needed
 +X_INCL = -I${X11BASE}/include # location of X include files, if needed
+ 
+ # A lot of popular terminals are brain damaged, so we cannot use X
+ # resources for configuration. In those cases Xt routines won't even be
+ # called, so you might want to use lazy loading for Xt if your OS supports it.
+ 
  X_LIBS = -lXt -lX11 # X libs
 -XF_LIB = -L/usr/local/lib -lcompface # compface library
--C_FLAGS = -O -D_REENTRANT
-+XF_LIB = -L${X11BASE}/lib -L${LOCALBASE}/lib -lcompface # compface library
-+C_FLAGS+= -O -D_REENTRANT
+-C_FLAGS = -O
++XF_LIB = -L${X11BASE}/lib -lcompface # compface library
++C_FLAGS = #-O
+ 
+ prefix = /usr/local
  
- OS_DEFS = #-DLINUX_SUX
+ # No need to configure anything below.
  
- CFLAGS = $(C_FLAGS) $(OS_DEFS) $(X_INCL)
--LDFLAGS = $(XF_LIB) $(X_LIBS) -lpthread
-+LDFLAGS = $(XF_LIB) $(X_LIBS) "-pthread"
+-CFLAGS = $(C_FLAGS) $(X_INCL)
+-LDFLAGS = $(XF_LIB) $(X_LIBS)
++CFLAGS += $(C_FLAGS) $(X_INCL)
++LDFLAGS += $(XF_LIB) $(X_LIBS)
  
  slrnface: slrnface.c
  	$(CC) $(CFLAGS) -o slrnface slrnface.c $(LDFLAGS)
diff --git a/news/slrnface/files/patch-slrnface.sl b/news/slrnface/files/patch-slrnface.sl
deleted file mode 100644
index b43f5b93fd35..000000000000
--- a/news/slrnface/files/patch-slrnface.sl
+++ /dev/null
@@ -1,11 +0,0 @@
---- slrnface.sl.orig	Wed Apr 10 18:34:08 2002
-+++ slrnface.sl	Wed Apr 10 18:34:22 2002
-@@ -16,7 +16,7 @@
- %  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- 
--variable xfacefp;
-+variable xfacefp = NULL;
- 
- define startup_hook()
- {
diff --git a/news/slrnface/pkg-descr b/news/slrnface/pkg-descr
index 0b809ad86642..d9b738cced91 100644
--- a/news/slrnface/pkg-descr
+++ b/news/slrnface/pkg-descr
@@ -1,6 +1,3 @@
 slrnface shows X-Faces from slrn in an X11 terminal emulator
 
-WWW: http://fly.cc.fer.hr/~dave/slrnface/
-
-- Oliver Braun
-obraun@informatik.unibw-muenchen.de
+WWW: http://dave.willfork.com/slrnface/