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.

6 files changed, 51 insertions, 6 deletions

diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index c670fe359c90..c24e67687edd 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -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/
diff --git a/textproc/xerces-c2-devel/pkg-plist b/textproc/xerces-c2-devel/pkg-plist
index 9c2b0d8b5acb..3f9662f35672 100644
--- a/textproc/xerces-c2-devel/pkg-plist
+++ b/textproc/xerces-c2-devel/pkg-plist
@@ -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
diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile
index c670fe359c90..c24e67687edd 100644
--- a/textproc/xerces-c2/Makefile
+++ b/textproc/xerces-c2/Makefile
@@ -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/
diff --git a/textproc/xerces-c2/pkg-plist b/textproc/xerces-c2/pkg-plist
index 9c2b0d8b5acb..3f9662f35672 100644
--- a/textproc/xerces-c2/pkg-plist
+++ b/textproc/xerces-c2/pkg-plist
@@ -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
diff --git a/textproc/xerces-c27/Makefile b/textproc/xerces-c27/Makefile
index c670fe359c90..c24e67687edd 100644
--- a/textproc/xerces-c27/Makefile
+++ b/textproc/xerces-c27/Makefile
@@ -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/
diff --git a/textproc/xerces-c27/pkg-plist b/textproc/xerces-c27/pkg-plist
index 9c2b0d8b5acb..3f9662f35672 100644
--- a/textproc/xerces-c27/pkg-plist
+++ b/textproc/xerces-c27/pkg-plist
@@ -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