Author: thierry
Date: Wed Mar 5 18:19:46 2014
New Revision: 347131
URL: http://svnweb.freebsd.org/changeset/ports/347131
QAT: https://qat.redports.org/buildarchive/r347131/
Log:
Add missing CONFLICTS lines.
Since I'm there, support staging and fix build in poudriere.
PR: ports/181480
Submitted by: Stephen Hurd <shurd (at) sasktel.net>
Modified:
head/textproc/xerces-c2-devel/Makefile
head/textproc/xerces-c2-devel/files/patch-aa
head/textproc/xerces-c2/Makefile
Modified: head/textproc/xerces-c2-devel/Makefile
==============================================================================
--- head/textproc/xerces-c2-devel/Makefile Wed Mar 5 18:19:06 2014 (r347130)
+++ head/textproc/xerces-c2-devel/Makefile Wed Mar 5 18:19:46 2014 (r347131)
@@ -12,6 +12,8 @@ DISTNAME= xerces-c-src_${PORTVERSION:S/.
MAINTAINER= jmohacsi at bsd.hu
COMMENT= Validating XML parser from the Apache XML Project
+CONFLICTS= xerces_c2-[0-9]* xerces-c3-[0-9]*
+
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= THREADS DEBUG ICONVFBSD ICU NATIVE
@@ -23,7 +25,6 @@ ICONVFBSD_DESC= Use IconvFBSD transcode
ICU_DESC= Use ICU transcoder
NATIVE_DESC= Use native transcoder
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNATIVE}
@@ -41,8 +42,8 @@ TRANSCODER= IconvFBSD
.if !defined(TRANSCODER)
USES+= iconv
TRANSCODER= IconvFBSD
-ICONVROOT?= ${LOCALBASE}
-CONFIGURE_ENV+= ICONVROOT=${ICONVROOT}
+ICONVROOT?= ${ICONV_PREFIX}
+CONFIGURE_ENV+= ICONVROOT=${ICONVROOT} ICONV_LIB=${ICONV_LIB}
MAKE_ENV+= ICONVROOT=${ICONVROOT}
PLIST_SUB+= TRANSICONV=""
PLIST_SUB+= TRANSICU="@comment "
@@ -62,8 +63,8 @@ PLIST_SUB+= TRANSICU="@comment "
.else
USES+= iconv
TRANSCODER= IconvFBSD
-ICONVROOT?= ${LOCALBASE}
-CONFIGURE_ENV+= ICONVROOT=${ICONVROOT}
+ICONVROOT?= ${ICONV_PREFIX}
+CONFIGURE_ENV+= ICONVROOT=${ICONVROOT} ICONV_LIB=${ICONV_LIB}
MAKE_ENV+= ICONVROOT=${ICONVROOT}
PLIST_SUB+= TRANSICONV=""
PLIST_SUB+= TRANSICU="@comment "
@@ -77,7 +78,7 @@ CONFIGURE_WRKSRC= ${XERCESWRKSRC}
BUILD_WRKSRC= ${XERCESWRKSRC}
INSTALL_WRKSRC= ${XERCESWRKSRC}
-USE_GMAKE= yes
+USES+= gmake
MAKE_ENV+= XERCESCROOT=${WRKSRC}
HAS_CONFIGURE= yes
@@ -172,16 +173,16 @@ post-configure:
post-install:
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${CP} -r ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for i in ${XERCES_BINS} data
- @${CP} -r ${WRKSRC}/samples/$i ${EXAMPLESDIR}
+ @${CP} -r ${WRKSRC}/samples/$i ${STAGEDIR}${EXAMPLESDIR}
.endfor
.for i in ${XERCES_BINS}
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}${PREFIX}/bin
.endfor
.endif
Modified: head/textproc/xerces-c2-devel/files/patch-aa
==============================================================================
--- head/textproc/xerces-c2-devel/files/patch-aa Wed Mar 5 18:19:06 2014 (r347130)
+++ head/textproc/xerces-c2-devel/files/patch-aa Wed Mar 5 18:19:46 2014 (r347131)
@@ -81,7 +81,7 @@
+ if test ${ICONVROOT}o != "o"; then
+ ICONVROOT=/usr/local
+ fi
-+ transcodingLibs="-L${ICONVROOT} -L${ICONVROOT}/lib -liconv" ;;
++ transcodingLibs="-L${ICONVROOT} -L${ICONVROOT}/lib ${ICONV_LIB}" ;;
IconvGNU)
TRANSCODER=IconvGNU ;
transcodingDefines="-DXML_USE_GNU_TRANSCODER -I/usr/local/include" ;;
Modified: head/textproc/xerces-c2/Makefile
==============================================================================
--- head/textproc/xerces-c2/Makefile Wed Mar 5 18:19:06 2014 (r347130)
+++ head/textproc/xerces-c2/Makefile Wed Mar 5 18:19:46 2014 (r347131)
@@ -12,6 +12,8 @@ DISTNAME= xerces-c-src_${PORTVERSION:S/.
MAINTAINER= ports at FreeBSD.org
COMMENT= Validating XML parser from the Apache XML Project
+CONFLICTS= xerces_c2-devel-[0-9]* xerces-c3-[0-9]*
+
OPTIONS_DEFINE= DOCS DEBUG EXAMPLES THREADS
OPTIONS_SINGLE= TCODER
OPTIONS_SINGLE_TCODER= ICONVFBSD ICU NATIVE
@@ -41,7 +43,7 @@ PLIST_SUB+= TRANSICU="@comment "
.if ${PORT_OPTIONS:MICONVFBSD}
USES+= iconv
TRANSCODER= IconvFBSD
-ICONVROOT?= ${LOCALBASE}
+ICONVROOT?= ${ICONV_PREFIX}
CONFIGURE_ENV+= ICONVROOT=${ICONVROOT}
MAKE_ENV+= ICONVROOT=${ICONVROOT}
PLIST_SUB+= TRANSICONV=""
@@ -55,7 +57,7 @@ CONFIGURE_WRKSRC= ${XERCESWRKSRC}
BUILD_WRKSRC= ${XERCESWRKSRC}
INSTALL_WRKSRC= ${XERCESWRKSRC}
-USE_GMAKE= yes
+USES+= gmake
MAKE_ENV+= XERCESCROOT=${WRKSRC}
MAKE_JOBS_UNSAFE= yes