Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Nov 2000 21:10:04 +0100 (CET)
From:      olgeni@uli.it
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/23093: maintainer update: sysutils/webmin
Message-ID:  <200011252010.eAPKA4W01724@olgeni.localdomain.net>

next in thread | raw e-mail | index | archive | help

>Number:         23093
>Category:       ports
>Synopsis:       maintainer update: sysutils/webmin
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 25 12:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Jimmy Olgeni
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
Colby
>Environment:

FreeBSD olgeni.localdomain.net 4.2-STABLE FreeBSD 4.2-STABLE #0: Thu Nov 23 00:16:27 CET 2000     root@olgeni.localdomain.net:/usr/obj/usr/src/sys/BSDBOX  i386

>Description:

Makefile:

	do-install:
		
		* change ${LOCALBASE} to ${PREFIX}

		* make etc/rc.d/webmin.sh executable (helps shell command
		completion too)

files/webmin.sh.sample:

	* Support both "start" and "stop" options; start webmin if invoked
	without parameters, to preserve compatibility with the previous 
	version

>How-To-Repeat:
>Fix:

diff -ruN webmin.orig/Makefile webmin/Makefile
--- webmin.orig/Makefile	Sat Nov 25 21:07:01 2000
+++ webmin/Makefile	Sat Nov 25 20:07:15 2000
@@ -29,11 +29,12 @@
 	${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.4
 
 do-install:
-	${MKDIR} ${LOCALBASE}/lib/webmin
-	${CP} -r ${WRKSRC}/* ${LOCALBASE}/lib/webmin
-	@cd ${LOCALBASE}/lib/webmin && find . -name "*.orig" -print \
+	@${MKDIR} ${PREFIX}/lib/webmin
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/lib/webmin
+	@cd ${PREFIX}/lib/webmin && find . -name "*.orig" -print \
 		| xargs ${RM}
-	@cd ${LOCALBASE}/lib/webmin && ./setup.sh
-	${MV} /tmp/webmin.sh ${LOCALBASE}/etc/rc.d/webmin.sh
+	@cd ${PREFIX}/lib/webmin && ./setup.sh
+	@${MV} /tmp/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh
+	@${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh
 
 .include <bsd.port.mk>
diff -ruN webmin.orig/files/webmin.sh.sample webmin/files/webmin.sh.sample
--- webmin.orig/files/webmin.sh.sample	Wed Nov  1 14:09:35 2000
+++ webmin/files/webmin.sh.sample	Sat Nov 25 19:53:14 2000
@@ -2,8 +2,24 @@
 
 # $FreeBSD: ports/sysutils/webmin/files/webmin.sh.sample,v 1.1 2000/11/01 13:09:35 andreas Exp $
 
-if [ "x$1" = "x" -o "x$1" = "xstart" ]; then
-	if [ -x !!PREFIX!!/etc/webmin/start ]; then
-		!!PREFIX!!/etc/webmin/start
-	fi
-fi
+case $1 in
+
+	""|start)
+		if [ -x !!PREFIX!!/etc/webmin/start ]; then
+			!!PREFIX!!/etc/webmin/start >/dev/null
+      	  	echo -n ' webmin'
+		fi
+		;;
+
+	stop)
+		if [ -x !!PREFIX!!/etc/webmin/stop ]; then
+			!!PREFIX!!/etc/webmin/stop >/dev/null
+        		echo -n ' webmin'
+		fi
+		;;
+
+	*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+esac

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200011252010.eAPKA4W01724>