6 files changed, 14 insertions, 30 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index e739a46d7a77..7757753da1f0 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	irssi
-# Version required:		0.7.13
+# Version required:		0.7.14
 # Date created:			14 Apr 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	irssi-0.7.13-2
-PKGNAME=	irssi-0.7.13
+DISTNAME=	irssi-0.7.14
 CATEGORIES=	irc
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		PropList.1:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -25,7 +25,8 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pthreads --without-socks --without-textui
+CONFIGURE_ARGS=	--without-pthreads --without-socks --without-textui \
+		--with-proplist=${LOCALBASE}
 
 .if defined(USE_GNOME)
 CONFIGURE_ARGS+= --with-gnome
@@ -41,10 +42,4 @@ CONFIGURE_ARGS+= --without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
 
-post-install:
-	@${ECHO} "===>   Installing example irssi.conf to ${PREFIX}/share/examples/irssi"
-	@${ECHO} "===>   You will find a ~/.irssi.conf after running irssi for the first time."
-	@${MKDIR} ${PREFIX}/share/examples/irssi && ${CHMOD} a+rx ${PREFIX}/share/examples/irssi
-	@${INSTALL_DATA} ${WRKSRC}/irssi.conf ${PREFIX}/share/examples/irssi
-
 .include <bsd.port.mk>
diff --git a/irc/irssi-devel/distinfo b/irc/irssi-devel/distinfo
index b1d6dad382aa..8724bed5273b 100644
--- a/irc/irssi-devel/distinfo
+++ b/irc/irssi-devel/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.13-2.tar.bz2) = 871b6ebb7fd470cd0cd10149cb065998
+MD5 (irssi-0.7.14.tar.bz2) = 2071c7eb1d80ca75acdade532db40cc5
diff --git a/irc/irssi-devel/pkg-plist b/irc/irssi-devel/pkg-plist
index 36da5c4a0fcb..700e19e2abf5 100644
--- a/irc/irssi-devel/pkg-plist
+++ b/irc/irssi-devel/pkg-plist
@@ -1,6 +1,5 @@
 bin/irssi
 bin/irssi-bot
-bin/irssi-text
 lib/irssi/plugins/libexternal.a
 lib/irssi/plugins/libexternal.so
 lib/irssi/plugins/libexternal.so.0
@@ -16,7 +15,5 @@ lib/irssi/plugins/libspeech.so.0
 lib/irssi/plugins/libsound.a
 lib/irssi/plugins/libsound.so
 lib/irssi/plugins/libsound.so.0
-share/examples/irssi/irssi.conf
 @dirrm lib/irssi/plugins
 @dirrm lib/irssi
-@dirrm share/examples/irssi
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index e739a46d7a77..7757753da1f0 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	irssi
-# Version required:		0.7.13
+# Version required:		0.7.14
 # Date created:			14 Apr 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	irssi-0.7.13-2
-PKGNAME=	irssi-0.7.13
+DISTNAME=	irssi-0.7.14
 CATEGORIES=	irc
 MASTER_SITES=	http://xlife.dhs.org/irssi/files/
 
 MAINTAINER=	jim@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		PropList.1:${PORTSDIR}/devel/libPropList
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -25,7 +25,8 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pthreads --without-socks --without-textui
+CONFIGURE_ARGS=	--without-pthreads --without-socks --without-textui \
+		--with-proplist=${LOCALBASE}
 
 .if defined(USE_GNOME)
 CONFIGURE_ARGS+= --with-gnome
@@ -41,10 +42,4 @@ CONFIGURE_ARGS+= --without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
 
-post-install:
-	@${ECHO} "===>   Installing example irssi.conf to ${PREFIX}/share/examples/irssi"
-	@${ECHO} "===>   You will find a ~/.irssi.conf after running irssi for the first time."
-	@${MKDIR} ${PREFIX}/share/examples/irssi && ${CHMOD} a+rx ${PREFIX}/share/examples/irssi
-	@${INSTALL_DATA} ${WRKSRC}/irssi.conf ${PREFIX}/share/examples/irssi
-
 .include <bsd.port.mk>
diff --git a/irc/irssi/distinfo b/irc/irssi/distinfo
index b1d6dad382aa..8724bed5273b 100644
--- a/irc/irssi/distinfo
+++ b/irc/irssi/distinfo
@@ -1 +1 @@
-MD5 (irssi-0.7.13-2.tar.bz2) = 871b6ebb7fd470cd0cd10149cb065998
+MD5 (irssi-0.7.14.tar.bz2) = 2071c7eb1d80ca75acdade532db40cc5
diff --git a/irc/irssi/pkg-plist b/irc/irssi/pkg-plist
index 36da5c4a0fcb..700e19e2abf5 100644
--- a/irc/irssi/pkg-plist
+++ b/irc/irssi/pkg-plist
@@ -1,6 +1,5 @@
 bin/irssi
 bin/irssi-bot
-bin/irssi-text
 lib/irssi/plugins/libexternal.a
 lib/irssi/plugins/libexternal.so
 lib/irssi/plugins/libexternal.so.0
@@ -16,7 +15,5 @@ lib/irssi/plugins/libspeech.so.0
 lib/irssi/plugins/libsound.a
 lib/irssi/plugins/libsound.so
 lib/irssi/plugins/libsound.so.0
-share/examples/irssi/irssi.conf
 @dirrm lib/irssi/plugins
 @dirrm lib/irssi
-@dirrm share/examples/irssi