9 files changed, 14 insertions, 16 deletions
diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index e8ce148..90ac108 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -15,8 +15,8 @@ USE_AUTOCONF_VER=	253
 USE_AUTOMAKE_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-INCDIR=		${PORTSDIR}/net
+LICQ_PORT?=	${PORTSDIR}/net/licq
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/licq/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile
index fd2bfb3..194522a 100644
--- a/net-im/licq-qt-gui/Makefile
+++ b/net-im/licq-qt-gui/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-INCDIR=		${PORTSDIR}/net
+LICQ_PORT?=	${PORTSDIR}/net/licq
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=3
@@ -46,5 +46,5 @@ post-install:
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/licq/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 90485a9..55d55b5 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-INCDIR?=	${.CURDIR}
+LICQ_PORT?=	${.CURDIR}
 
 # workaround for installed autoconf/automake
 CONFIGURE_ARGS+=--program-transform-name=s,y,y,
@@ -40,5 +40,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 1f829c9..e26346e 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -7,7 +7,6 @@ QT_LICQ_VER=		1.2.4
 RMS_LICQ_VER=		0.33
 CONSOLE_LICQ_VER=	1.2.4
 JONS_GTK_LICQ_VER=	0.20.2
-LICQ_PORT?=		${PORTSDIR}/net/licq
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${LICQ_PORT}
 .endif
diff --git a/net/licq-console/Makefile b/net/licq-console/Makefile
index e8ce148..90ac108 100644
--- a/net/licq-console/Makefile
+++ b/net/licq-console/Makefile
@@ -15,8 +15,8 @@ USE_AUTOCONF_VER=	253
 USE_AUTOMAKE_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-INCDIR=		${PORTSDIR}/net
+LICQ_PORT?=	${PORTSDIR}/net/licq
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/licq/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net/licq-jons-gtk-gui/Makefile b/net/licq-jons-gtk-gui/Makefile
index ce9bfef..c7eeaec 100644
--- a/net/licq-jons-gtk-gui/Makefile
+++ b/net/licq-jons-gtk-gui/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-INCDIR=		${PORTSDIR}/net
+LICQ_PORT?=	${PORTSDIR}/net/licq
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 PLIST_SUB+=	GUI_NAME=jons-gtk
@@ -24,5 +24,5 @@ post-patch:
 	${SED} -e "s=gtk-config=gtk12-config=" ${EXTRA_FIX}.sed > ${EXTRA_FIX}
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/licq/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net/licq-qt-gui/Makefile b/net/licq-qt-gui/Makefile
index fd2bfb3..194522a 100644
--- a/net/licq-qt-gui/Makefile
+++ b/net/licq-qt-gui/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
-INCDIR=		${PORTSDIR}/net
+LICQ_PORT?=	${PORTSDIR}/net/licq
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=3
@@ -46,5 +46,5 @@ post-install:
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/licq/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net/licq/Makefile b/net/licq/Makefile
index 90485a9..55d55b5 100644
--- a/net/licq/Makefile
+++ b/net/licq/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-INCDIR?=	${.CURDIR}
+LICQ_PORT?=	${.CURDIR}
 
 # workaround for installed autoconf/automake
 CONFIGURE_ARGS+=--program-transform-name=s,y,y,
@@ -40,5 +40,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
-.include "${INCDIR}/Makefile.inc"
+.include "${LICQ_PORT}/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/net/licq/Makefile.inc b/net/licq/Makefile.inc
index 1f829c9..e26346e 100644
--- a/net/licq/Makefile.inc
+++ b/net/licq/Makefile.inc
@@ -7,7 +7,6 @@ QT_LICQ_VER=		1.2.4
 RMS_LICQ_VER=		0.33
 CONSOLE_LICQ_VER=	1.2.4
 JONS_GTK_LICQ_VER=	0.20.2
-LICQ_PORT?=		${PORTSDIR}/net/licq
 .if ${PORTNAME} != "base"
 RUN_DEPENDS+=		licq:${LICQ_PORT}
 .endif