1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00

- Upgrade to version 1.650.

- Add staging support.
- Do not mute install commands.
- Remove automatic PLIST generation.
- Do not use /usr/sbin/pkg for pkgng detection; if you run it in batch it
  may stop with an interactive prompt on 9.x.
This commit is contained in:
Jimmy Olgeni 2013-10-05 13:45:02 +00:00
parent c570a68c6b
commit 6ef61f34dd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=329458
4 changed files with 24703 additions and 37 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= webmin
PORTVERSION= 1.630
PORTVERSION= 1.650
CATEGORIES= sysutils
MASTER_SITES= http://download.webmin.com/updates/:up \
SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
@ -26,7 +26,6 @@ SUB_FILES= pkg-message
WEBMIN_MODULES=
NO_STAGE= yes
post-extract:
@${RM} -f ${WRKSRC}/mount/freebsd-mounts-?
@if [ "${WEBMIN_MODULES}" != "" ]; then \
@ -59,38 +58,12 @@ post-patch:
@${PRINTF} "g/^FreeBSD/m0\nwq\n" | ex ${WRKSRC}/os_list.txt
do-build:
@${PYTHON_CMD} -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
@${PYTHON_CMD} -O -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
@${CC} ${CFLAGS} -o ${WRKSRC}/mount/freebsd-mounts-7 ${WRKSRC}/mount/freebsd-mounts-7.c
do-install:
@${MKDIR} ${PREFIX}/lib/webmin
@${CP} -r ${WRKSRC}/* ${PREFIX}/lib/webmin
post-install:
@${PYTHON_CMD} -O -mcompileall ${PREFIX}/lib/webmin/ajaxterm/ajaxterm/
@${PYTHON_CMD} -mcompileall ${PREFIX}/lib/webmin/ajaxterm/ajaxterm/
@cd ${WRKSRC} ; ${FIND} * -type f -o -type l | ${SORT} | ${AWK} \
'{ print "lib/webmin/" $$1 }' > ${WRKDIR}/PLIST.lib-webmin
@cd ${WRKSRC} ; ${FIND} * -type f -name "*.py" | ${SED} -e "s/\\.py/.pyc/" | ${SORT} | ${AWK} \
'{ print "lib/webmin/" $$1 }' >> ${WRKDIR}/PLIST.lib-webmin
@cd ${WRKSRC} ; ${FIND} * -type f -name "*.py" | ${SED} -e "s/\\.py/.pyo/" | ${SORT} | ${AWK} \
'{ print "lib/webmin/" $$1 }' >> ${WRKDIR}/PLIST.lib-webmin
@cd ${WRKSRC} ; ${FIND} * -type d -empty | ${SORT} -r | ${AWK} \
'{ print "lib/webmin/" $$1 }' | ${SED} -e 's#^#@exec mkdir -p %D/#g' \
>> ${WRKDIR}/PLIST.lib-webmin
@cd ${WRKSRC} ; ${FIND} * -type d | ${SORT} -r | ${AWK} \
'{ print "lib/webmin/" $$1 }' | ${SED} -e 's/^/@dirrm /g' \
>> ${WRKDIR}/PLIST.lib-webmin
@${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
@${ECHO_CMD} "/Insert PLIST.lib-webmin" >> ${WRKDIR}/ex.script
@${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
@${ECHO_CMD} "r ${WRKDIR}/PLIST.lib-webmin" >> ${WRKDIR}/ex.script
@${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
@${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-webmin
@cd ${WRKDIR} ; ex < ex.script
@if [ -d ${PREFIX}/etc/webmin ]; then \
${PREFIX}/lib/webmin/setup.sh; \
fi
@${CAT} ${PKGMESSAGE}
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/webmin
${CP} -r ${WRKSRC}/* ${STAGEDIR}${PREFIX}/lib/webmin
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (webmin-1.630.tar.gz) = 2ba5616a252d8108aab0573f615f7cc5c8c15b7df8c11bbcecf7acc23964432f
SIZE (webmin-1.630.tar.gz) = 21744645
SHA256 (webmin-1.650.tar.gz) = e9313137735040e156edf6e85a3d19f96f9d8053c4f4f8b1fba952af9c396805
SIZE (webmin-1.650.tar.gz) = 22160298

View File

@ -0,0 +1,14 @@
$FreeBSD$
--- software/freebsd-lib.pl.orig
+++ software/freebsd-lib.pl
@@ -21,7 +21,7 @@
sub use_pkg_ng
{
-return 0 if (!-x "/usr/sbin/pkg");
+return 0 if (!-e "/var/db/pkg/local.sqlite");
local @lines = &backquote_command("/usr/sbin/pkg info 2>/dev/null </dev/null");
return @lines > 1 ? 1 : 0;
}

File diff suppressed because it is too large Load Diff