Found while looking through a bulk on arm64. The Makefile references
ARCH, while the PLIST references P5ARCH, which is uses MACHINE_ARCH.
On amd64, they are the same, but on arm64 one of them is aarch64. A few
of our other platforms have this difference as well.
the '/auto/' prefix seems unused, so I simply removed it as well.
No REVISION bump because non-affected arches won't see a difference, and
affected arches didn't build.
OK?
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/openbsd/ports/www/nginx/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- www/nginx/Makefile 10 Nov 2018 08:43:34 -0000 1.127
+++ www/nginx/Makefile 24 Nov 2018 16:48:45 -0000
@@ -199,10 +199,10 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/nginx/html/
${INSTALL_DATA_DIR} ${WRKINST}/var/www/modules/
${INSTALL_DATA} ${WRKSRC}/objs/*.so ${WRKINST}/var/www/modules/
- ${INSTALL_DATA_DIR}
${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/auto/
+ ${INSTALL_DATA_DIR} ${PREFIX}/${P5ARCH}/
${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
- ${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/
+ ${PREFIX}/${P5ARCH}/
${INSTALL_DATA}
${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
- ${PREFIX}/libdata/perl5/site_perl/${ARCH}-openbsd/
+ ${PREFIX}/${P5ARCH}/
.include <bsd.port.mk>
--
I've found my niche. If you're wondering why I'm not there, there was
this little hole in the bottom ...
-- John Croll