diff options
| author | thierry <thierry@FreeBSD.org> | 2014-03-06 02:19:46 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2014-03-06 02:19:46 +0800 |
| commit | bc228a082b4b569f26f95d1cbc905d7452b4e506 (patch) | |
| tree | 99d07fb2e58a4f0d992de35d5ce90fe50c53e637 | |
| parent | c58932057f865fb69eb02c14553baa9d8d37b8c4 (diff) | |
| download | freebsd-ports-gnome-bc228a082b4b569f26f95d1cbc905d7452b4e506.tar.gz freebsd-ports-gnome-bc228a082b4b569f26f95d1cbc905d7452b4e506.tar.zst freebsd-ports-gnome-bc228a082b4b569f26f95d1cbc905d7452b4e506.zip | |
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>
| -rw-r--r-- | textproc/xerces-c2-devel/Makefile | 23 | ||||
| -rw-r--r-- | textproc/xerces-c2-devel/files/patch-aa | 2 | ||||
| -rw-r--r-- | textproc/xerces-c2/Makefile | 6 |
3 files changed, 17 insertions, 14 deletions
diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile index 6d6bbfa508a9..1c0f08712e6d 100644 --- a/textproc/xerces-c2-devel/Makefile +++ b/textproc/xerces-c2-devel/Makefile @@ -12,6 +12,8 @@ DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g} MAINTAINER= jmohacsi@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 transcoder 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 diff --git a/textproc/xerces-c2-devel/files/patch-aa b/textproc/xerces-c2-devel/files/patch-aa index e058afbec12b..c5c01fc54001 100644 --- a/textproc/xerces-c2-devel/files/patch-aa +++ b/textproc/xerces-c2-devel/files/patch-aa @@ -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" ;; diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile index 0b2fb26ac3e7..c443c1e051d1 100644 --- a/textproc/xerces-c2/Makefile +++ b/textproc/xerces-c2/Makefile @@ -12,6 +12,8 @@ DISTNAME= xerces-c-src_${PORTVERSION:S/./_/g} MAINTAINER= ports@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 |