From 0dcbc7e0ddd40f34f0366bb24c12796d48c1df5d Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Fri, 9 Oct 2015 12:12:45 +0000 Subject: Make sure to patch all config files for %%PREFIX%%. --- sysutils/usermin/Makefile | 3 ++- sysutils/webmin/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index 27b9f8594eae..da5f35898fd1 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -2,6 +2,7 @@ PORTNAME= usermin PORTVERSION= 1.670 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/uupdates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \ @@ -43,7 +44,7 @@ post-patch: @${REINPLACE_CMD} -i '' -e 's|=/etc/webmin|=${PREFIX}/etc/webmin|' ${WRKSRC}/${file} .endfor - @${FIND} ${WRKSRC} -name config-freebsd\* \ + @${FIND} ${WRKSRC} \( -name config-freebsd\* -or -name config \) \ -exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \ -exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \; diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index cbcd57d9a54f..dec5542551d2 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -3,6 +3,7 @@ PORTNAME= webmin PORTVERSION= 1.760 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf @@ -37,7 +38,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh - @${FIND} ${WRKSRC} -name config-freebsd\* \ + @${FIND} ${WRKSRC} \( -name config-freebsd\* -or -name config \) \ -exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \ -exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \; -- cgit v1.2.3