- use -Wno-deprecated only in CXXFLAGS

- force configure to use PTHREAD_CFLAGS

2 files changed, 9 insertions, 9 deletions

diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 25f4580a380e..9fc536e375c8 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -19,6 +19,7 @@ COMMENT=	A popular ICQ-compatible plugin-based program
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 .endif
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	${.CURDIR}
 
@@ -39,13 +40,12 @@ CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB}
 .endif
 
 pre-configure:
-	@${MV} ${WRKSRC}/src/licq.conf.h ${WRKSRC}/src/licq.conf.h.sed
-	${SED} -e "s=/usr/share/licq=${PREFIX}/share/licq=" \
-		${WRKSRC}/src/licq.conf.h.sed > ${WRKSRC}/src/licq.conf.h
+	${REINPLACE_CMD} -e 's=/usr/share/licq=${PREFIX}/share/licq=' \
+		${WRKSRC}/src/licq.conf.h
 	@${ECHO_MSG} Ignoring existing libgnugetopt
-	@${MV} ${WRKSRC}/configure ${WRKSRC}/configure.sed
-	${SED} -e "s=getopt.h==" \
-		${WRKSRC}/configure.sed > ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's=getopt.h==' \
+		-e 's=FLAGS -pthread=FLAGS ${PTHREAD_CFLAGS}=' \
+		${WRKSRC}/configure
 	${CHMOD} +x ${WRKSRC}/configure
 
 post-install:
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 4fe4a5aa4de5..32063ef878e9 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -23,7 +23,7 @@ USE_BZIP2=		yes
 WRKSRC?=		${WRKDIR}/${DISTNAME}/plugins/${PORTNAME}
 PLIST_SUB+=		LICQ_DEVEL="@comment "
 .if ${OSVERSION} > 500030
-CPPFLAGS+=		-Wno-deprecated
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-MAKE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CXXFLAGS+=		-Wno-deprecated
+CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 .endif