Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jan 2014 11:03:15 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340027 - head/net-im/climm
Message-ID:  <201401171103.s0HB3FKS033261@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Fri Jan 17 11:03:15 2014
New Revision: 340027
URL: http://svnweb.freebsd.org/changeset/ports/340027
QAT: https://qat.redports.org/buildarchive/r340027/

Log:
  - Convert to USES=tcl and USES=gmake
  - Convert to new LIB_DEPENDS format
  - STAGE-clean

Modified:
  head/net-im/climm/Makefile

Modified: head/net-im/climm/Makefile
==============================================================================
--- head/net-im/climm/Makefile	Fri Jan 17 10:33:08 2014	(r340026)
+++ head/net-im/climm/Makefile	Fri Jan 17 11:03:15 2014	(r340027)
@@ -12,8 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	CLI-based Multi-Messenger
 
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -28,13 +27,12 @@ OTR_DESC=	Enable OTR encryption support
 REMOTE_DESC=	Enable Remote control fifo support
 XMPP_DESC=	Enable XMPP Jabber support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOTR}
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-otr
-LIB_DEPENDS+=		otr.4:${PORTSDIR}/security/libotr3
+LIB_DEPENDS+=		libotr.so.4:${PORTSDIR}/security/libotr3
 .else
 CONFIGURE_ARGS+=	--disable-otr
 .endif
@@ -52,8 +50,7 @@ CONFIGURE_ARGS+=	--disable-peer2peer
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
-USE_TCL=		yes
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+USES+=			tcl
 .else
 CONFIGURE_ARGS+=	--disable-tcl
 .endif
@@ -69,10 +66,10 @@ CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-xmpp --enable-ssl=gnutls \
 			--with-libgcrypt-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls"
-LIB_DEPENDS+=		iksemel:${PORTSDIR}/textproc/iksemel \
-			gnutls:${PORTSDIR}/security/gnutls \
-			gcrypt:${PORTSDIR}/security/libgcrypt \
-			gpg-error:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS+=		libiksemel.so:${PORTSDIR}/textproc/iksemel \
+			libgnutls.so:${PORTSDIR}/security/gnutls \
+			libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+			libgpg-error.so:${PORTSDIR}/security/libgpg-error
 .else
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--disable-xmpp --enable-ssl=openssl
@@ -86,14 +83,12 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${MANPREFIX}/man/man7
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-. for ext in i18n logformat png txt xpm
-	${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${DOCSDIR}
-. endfor
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${STAGEDIR}${PREFIX}/man/man7
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for ext in i18n logformat png txt xpm
+	${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401171103.s0HB3FKS033261>