diff options
| author | dinoex <dinoex@FreeBSD.org> | 2004-03-26 17:49:07 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2004-03-26 17:49:07 +0000 |
| commit | 94cb17f8abab42c8d414add48edd4037f38433f8 (patch) | |
| tree | 9a754371e4ad43a6b06493f289688f191f3bd8e5 /net | |
| parent | 99a0325a2a289cca2d769412f8fde08650b300fb (diff) | |
| download | FreeBSD-ports-94cb17f8abab42c8d414add48edd4037f38433f8.zip FreeBSD-ports-94cb17f8abab42c8d414add48edd4037f38433f8.tar.gz | |
- make PKGNAMESUFFIX more flexible
- LICQ_PORT without PORTSDIR
Diffstat (limited to 'net')
| -rw-r--r-- | net/licq-console/Makefile | 4 | ||||
| -rw-r--r-- | net/licq-jons-gtk-gui/Makefile | 4 | ||||
| -rw-r--r-- | net/licq-qt-gui/Makefile | 9 | ||||
| -rw-r--r-- | net/licq/Makefile | 9 |
4 files changed, 12 insertions, 14 deletions
diff --git a/net/licq-console/Makefile b/net/licq-console/Makefile index 437b668..eb56d95 100644 --- a/net/licq-console/Makefile +++ b/net/licq-console/Makefile @@ -17,8 +17,8 @@ COMMENT= Ncurses-based console plugin for Licq #USE_AUTOMAKE_VER= 15 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LIBS="${PTHREAD_LIBS}" -LICQ_PORT?= ${PORTSDIR}/net/licq +LICQ_PORT?= net/licq .include <bsd.port.pre.mk> -.include "${LICQ_PORT}/Makefile.inc" +.include "${PORTSDIR}/${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 3077de8..fe49310 100644 --- a/net/licq-jons-gtk-gui/Makefile +++ b/net/licq-jons-gtk-gui/Makefile @@ -18,14 +18,14 @@ DISTNAME= ${PKGNAMEPREFIX}${LICQ_VER} MAINTAINER= dinoex@FreeBSD.org COMMENT= Jons GTK plugin for licq -RUN_DEPENDS+= licq:${LICQ_PORT} +RUN_DEPENDS+= licq:${PORTSDIR}/${LICQ_PORT} USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LIBS="${PTHREAD_LIBS}" -LICQ_PORT?= ${PORTSDIR}/net/licq +LICQ_PORT?= net/licq USE_GNOME= gtk12 PLIST_SUB+= GUI_NAME=jons-gtk EXTRA_FIX= ${WRKSRC}/src/Makefile.in diff --git a/net/licq-qt-gui/Makefile b/net/licq-qt-gui/Makefile index 0728221..73e1133 100644 --- a/net/licq-qt-gui/Makefile +++ b/net/licq-qt-gui/Makefile @@ -9,18 +9,17 @@ PORTNAME= qt-gui PORTVERSION= ${QT_LICQ_VER} PORTREVISION= 2 CATEGORIES= net -.if defined(WITH_KDE) -PKGNAMESUFFIX= -kde -.endif +PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Qt plugin for licq CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LIBS="${PTHREAD_LIBS}" -LICQ_PORT?= ${PORTSDIR}/net/licq +LICQ_PORT?= net/licq .if defined(WITH_KDE) +KDE_SUFFIX= -kde USE_KDELIBS_VER=3 CONFIGURE_ARGS+=--with-kde CONFIGURE_ENV+= KDEDIR="${LOCALBASE}" @@ -48,5 +47,5 @@ post-install: .endif .include <bsd.port.pre.mk> -.include "${LICQ_PORT}/Makefile.inc" +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" .include <bsd.port.post.mk> diff --git a/net/licq/Makefile b/net/licq/Makefile index 4414cfa..8e96cd6 100644 --- a/net/licq/Makefile +++ b/net/licq/Makefile @@ -9,9 +9,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} PORTREVISION= 2 CATEGORIES= net -.if defined(WITH_SOCKS) -PKGNAMESUFFIX= -socks -.endif +PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= A popular ICQ-compatible plugin-based program @@ -22,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 USE_REINPLACE= yes WRKSRC= ${WRKDIR}/${DISTNAME} -LICQ_PORT?= ${.CURDIR} +LICQ_PORT?= ${PKGCATEGORY}/${PORTDIRNAME} # workaround for installed autoconf/automake CONFIGURE_ARGS+=--program-transform-name=s,y,y, @@ -30,6 +28,7 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LDFLAGS+= ${PTHREAD_LIBS} .if defined(WITH_SOCKS) +SOCKS_SUFFIX= -socks CONFIGURE_ARGS+=--enable-socks5 CONFIGURE_ARGS+=--with-socks5-inc=${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -59,5 +58,5 @@ post-install: @${CAT} ${PKGMESSAGE} .include <bsd.port.pre.mk> -.include "${LICQ_PORT}/Makefile.inc" +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" .include <bsd.port.post.mk> |
