Fix the problem of non-root builds causing the files to retain that uid.
The originator(s) had a patch for this, but I misunderstood its purpose, and therefore erroneously omitted it. Also fix the problem related to the extremely lame naming scheme that this package uses. There is a different(?) patch for this floating around, but it didn't make it into the audit trail. My way works, and isn't _incredibly_ lame, so we'll try it for now.
This commit is contained in:
parent
a00e493b52
commit
83ee889b5a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68760
6 changed files with 51 additions and 6 deletions
|
@ -40,8 +40,11 @@ CONFIGURE_ARGS+= -t IconvFBSD
|
|||
CONFIGURE_ARGS+= -r none
|
||||
.endif
|
||||
|
||||
XERCESC_LIB_VERSIO= ${PORTVERSION:S/.//}
|
||||
XERCESC_LIB_VERSION= ${XERCESC_LIB_VERSIO:R}
|
||||
XERCESC_LIB= libxerces-c.so.${PORTVERSION:S/.//}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB} \
|
||||
XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION}
|
||||
|
||||
.if !defined(NO_SAMPLES)
|
||||
PLIST_SUB+= NO_SAMPLES=""
|
||||
|
@ -71,6 +74,13 @@ pre-fetch:
|
|||
@/bin/sleep 2
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist
|
||||
@${SED} -e 's#CP = -cp -p#CP = -cp#' \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl
|
||||
|
||||
pre-configure:
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/runConfigure
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure
|
||||
|
@ -84,7 +94,10 @@ post-configure:
|
|||
|
||||
post-install:
|
||||
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
|
||||
${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} \
|
||||
${PREFIX}/lib/libxerces-c.so.${XERCESC_LIB_VERSION:R}
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${PREFIX}/share/doc/xerces-c
|
||||
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
|
||||
|
|
|
@ -372,7 +372,9 @@ include/xercesc/validators/schema/GeneralAttributeCheck.hpp
|
|||
include/xercesc/validators/schema/XSDErrorReporter.hpp
|
||||
lib/%%XERCESC_LIB%%
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
|
||||
@dirrm include/xercesc/validators/schema/identity
|
||||
@dirrm include/xercesc/validators/schema
|
||||
@dirrm include/xercesc/validators/DTD
|
||||
|
|
|
@ -40,8 +40,11 @@ CONFIGURE_ARGS+= -t IconvFBSD
|
|||
CONFIGURE_ARGS+= -r none
|
||||
.endif
|
||||
|
||||
XERCESC_LIB_VERSIO= ${PORTVERSION:S/.//}
|
||||
XERCESC_LIB_VERSION= ${XERCESC_LIB_VERSIO:R}
|
||||
XERCESC_LIB= libxerces-c.so.${PORTVERSION:S/.//}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB} \
|
||||
XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION}
|
||||
|
||||
.if !defined(NO_SAMPLES)
|
||||
PLIST_SUB+= NO_SAMPLES=""
|
||||
|
@ -71,6 +74,13 @@ pre-fetch:
|
|||
@/bin/sleep 2
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist
|
||||
@${SED} -e 's#CP = -cp -p#CP = -cp#' \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl
|
||||
|
||||
pre-configure:
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/runConfigure
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure
|
||||
|
@ -84,7 +94,10 @@ post-configure:
|
|||
|
||||
post-install:
|
||||
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
|
||||
${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} \
|
||||
${PREFIX}/lib/libxerces-c.so.${XERCESC_LIB_VERSION:R}
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${PREFIX}/share/doc/xerces-c
|
||||
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
|
||||
|
|
|
@ -372,7 +372,9 @@ include/xercesc/validators/schema/GeneralAttributeCheck.hpp
|
|||
include/xercesc/validators/schema/XSDErrorReporter.hpp
|
||||
lib/%%XERCESC_LIB%%
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
|
||||
@dirrm include/xercesc/validators/schema/identity
|
||||
@dirrm include/xercesc/validators/schema
|
||||
@dirrm include/xercesc/validators/DTD
|
||||
|
|
|
@ -40,8 +40,11 @@ CONFIGURE_ARGS+= -t IconvFBSD
|
|||
CONFIGURE_ARGS+= -r none
|
||||
.endif
|
||||
|
||||
XERCESC_LIB_VERSIO= ${PORTVERSION:S/.//}
|
||||
XERCESC_LIB_VERSION= ${XERCESC_LIB_VERSIO:R}
|
||||
XERCESC_LIB= libxerces-c.so.${PORTVERSION:S/.//}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB}
|
||||
PLIST_SUB+= XERCESC_LIB=${XERCESC_LIB} \
|
||||
XERCESC_LIB_VERSION=${XERCESC_LIB_VERSION}
|
||||
|
||||
.if !defined(NO_SAMPLES)
|
||||
PLIST_SUB+= NO_SAMPLES=""
|
||||
|
@ -71,6 +74,13 @@ pre-fetch:
|
|||
@/bin/sleep 2
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${CP} ${WRKSRC}/src/xercesc/Makefile.incl \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist
|
||||
@${SED} -e 's#CP = -cp -p#CP = -cp#' \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl.Dist > \
|
||||
${WRKSRC}/src/xercesc/Makefile.incl
|
||||
|
||||
pre-configure:
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/runConfigure
|
||||
@${CHMOD} 700 ${CONFIGURE_WRKSRC}/configure
|
||||
|
@ -84,7 +94,10 @@ post-configure:
|
|||
|
||||
post-install:
|
||||
@${STRIP_CMD} ${PREFIX}/lib/${XERCESC_LIB}
|
||||
${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} ${PREFIX}/lib/libxerces-c.so
|
||||
@${LN} -sf ${XERCESC_LIB} \
|
||||
${PREFIX}/lib/libxerces-c.so.${XERCESC_LIB_VERSION:R}
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
@${MKDIR} ${PREFIX}/share/doc/xerces-c
|
||||
@${CP} -r ${WRKSRC}/doc/ ${PREFIX}/share/doc/xerces-c/
|
||||
|
|
|
@ -372,7 +372,9 @@ include/xercesc/validators/schema/GeneralAttributeCheck.hpp
|
|||
include/xercesc/validators/schema/XSDErrorReporter.hpp
|
||||
lib/%%XERCESC_LIB%%
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so
|
||||
@exec ln -sf %%XERCESC_LIB%% %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so; fi
|
||||
@unexec if test ! -r %D/lib/libxerces-c.so; then rm -f %D/lib/libxerces-c.so.%%XERCESC_LIB_VERSION%%; fi
|
||||
@dirrm include/xercesc/validators/schema/identity
|
||||
@dirrm include/xercesc/validators/schema
|
||||
@dirrm include/xercesc/validators/DTD
|
||||
|
|
Loading…
Reference in a new issue