- Sanitize plugin-directory handling: Plugins should not try to remove lib/icq

- Adapt one port to USE_LIBTOOL while here
- Mark licq-jons-gtk-gui as BROKEN: It's based on licq-1.2.4 which makes it
   incompatible with 1.3.0 (builds fine but doesn't run)

Approved by: dinoex

8 files changed, 10 insertions, 7 deletions

diff --git a/net/licq-console/Makefile b/net/licq-console/Makefile
index 139fca6ca3ae..295b7817f2ec 100644
--- a/net/licq-console/Makefile
+++ b/net/licq-console/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	console
 PORTVERSION=	${CONSOLE_LICQ_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 LIB_DEPENDS=	cdk.4:${PORTSDIR}/devel/cdk
@@ -15,6 +15,7 @@ LIB_DEPENDS=	cdk.4:${PORTSDIR}/devel/cdk
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ncurses-based console plugin for Licq
 
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
@@ -23,6 +24,8 @@ CPPFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+PLIST_FILES=	lib/licq/licq_console.so
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
diff --git a/net/licq-console/pkg-plist b/net/licq-console/pkg-plist
deleted file mode 100644
index 68a451780a80..000000000000
--- a/net/licq-console/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/licq/licq_console.la
-lib/licq/licq_console.so
-@dirrm lib/licq
diff --git a/net/licq-jons-gtk-gui/Makefile b/net/licq-jons-gtk-gui/Makefile
index fe493101a2bd..068b0a665fa7 100644
--- a/net/licq-jons-gtk-gui/Makefile
+++ b/net/licq-jons-gtk-gui/Makefile
@@ -18,6 +18,8 @@ DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Jons GTK plugin for licq
 
+BROKEN=		"Incompatible with licq-1.3.0"
+
 RUN_DEPENDS+=	licq:${PORTSDIR}/${LICQ_PORT}
 
 USE_BZIP2=	yes
diff --git a/net/licq-jons-gtk-gui/pkg-plist b/net/licq-jons-gtk-gui/pkg-plist
index 57558b2b96c0..328ccf4c44db 100644
--- a/net/licq-jons-gtk-gui/pkg-plist
+++ b/net/licq-jons-gtk-gui/pkg-plist
@@ -1,3 +1,2 @@
 lib/licq/licq_%%GUI_NAME%%-gui.la
 lib/licq/licq_%%GUI_NAME%%-gui.so
-@dirrm lib/licq
diff --git a/net/licq-qt-gui/Makefile b/net/licq-qt-gui/Makefile
index d9098fb1b689..85d5883d5906 100644
--- a/net/licq-qt-gui/Makefile
+++ b/net/licq-qt-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt-gui
 PORTVERSION=	${QT_LICQ_VER}
+PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX?=	${KDE_SUFFIX}${PKGNAMESUFFIX2}
 
diff --git a/net/licq-qt-gui/pkg-plist b/net/licq-qt-gui/pkg-plist
index 9439fdd4e886..9b575e721945 100644
--- a/net/licq-qt-gui/pkg-plist
+++ b/net/licq-qt-gui/pkg-plist
@@ -457,4 +457,3 @@ share/licq/qt-gui/locale/uk.qm
 @dirrm share/licq/qt-gui/dock.flower
 @dirrm share/licq/qt-gui/dock.console
 @dirrm share/licq/qt-gui
-@dirrm lib/licq
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 6f71d7068847..7ffb1519eb37 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
 
@@ -61,6 +61,7 @@ pre-configure:
 		${WRKSRC}/configure
 
 post-install:
+	@${MKDIR} ${PREFIX}/lib/licq
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
diff --git a/net/licq/pkg-plist b/net/licq/pkg-plist
index 79d7039cb462..305ab50adb88 100644
--- a/net/licq/pkg-plist
+++ b/net/licq/pkg-plist
@@ -110,6 +110,7 @@ share/licq/utilities/vnc.utility
 share/licq/utilities/xtraceroute.utility
 %%NLS%%share/locale/de/LC_MESSAGES/licq.mo
 @dirrm include/licq
+@exec mkdir -p %D/lib/licq
 @dirrm lib/licq
 @dirrm share/licq/sounds/fun
 @dirrm share/licq/sounds/icq