From a87698a36aa039560b51c2cb3fd344ed23d11c16 Mon Sep 17 00:00:00 2001 From: James FitzGibbon Date: Fri, 4 Oct 1996 00:38:38 +0000 Subject: Use INSTALL_ aliases in post-install: Create rc.d-style local startup script Fix omissions in pkg/PLIST Remove erroneous PREFIX in Makefile (and modify PLIST to match) Remove IS_INTERACTIVE (assume installation will run as root) Use union diffs instead of context diffs. --- databases/msql/Makefile | 22 ++++++++----- databases/msql/files/patch-aa | 55 +++++++++++++------------------ databases/msql/files/patch-ab | 73 +++++++++++++++++++++++++++++++----------- databases/msql/files/patch-ac | 57 ++++++++++++--------------------- databases/msql/pkg-plist | 47 ++++++++++++++++----------- databases/msql3/Makefile | 22 ++++++++----- databases/msql3/files/patch-aa | 55 +++++++++++++------------------ databases/msql3/files/patch-ab | 73 +++++++++++++++++++++++++++++++----------- databases/msql3/files/patch-ac | 57 ++++++++++++--------------------- databases/msql3/pkg-plist | 47 ++++++++++++++++----------- 10 files changed, 278 insertions(+), 230 deletions(-) (limited to 'databases') diff --git a/databases/msql/Makefile b/databases/msql/Makefile index ad4462b8fa2a..88830dfdb64a 100644 --- a/databases/msql/Makefile +++ b/databases/msql/Makefile @@ -1,31 +1,37 @@ # New ports collection makefile for: msql -# Version required: 1.0.14 +# Version required: 1.0.16 # Date created: 14 January 1995 # Whom: mr (original) # -# $Id$ +# $Id: Makefile,v 1.12 1996/08/29 10:20:55 asami Exp $ # DISTNAME= msql-1.0.16 CATEGORIES+= databases MASTER_SITES= ftp://bond.edu.au/pub/Minerva/msql/ -MAINTAINTER= jfitz@freebsd.org +MAINTAINTER= jfitz@FreeBSD.ORG -IS_INTERACTIVE= yes -PREFIX= /usr/local/Minerva +#IS_INTERACTIVE= yes NO_MTREE= yes RESTRICTED= "restrictive copyright (no commercial use)" post-install: .for file in Commercial License mSQL-Invoice.txt msql-pwr.README msql-pwr.gif msql-pwr2.gif - cp ${WRKSRC}/doc/${file} ${PREFIX}/doc + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/Minerva/doc .endfor .if !defined(NOPORTDOCS) .for file in HISTORY acl.txt mSQL-1.0.11.ps - cp ${WRKSRC}/doc/${file} ${PREFIX}/doc + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/Minerva/doc .endfor .endif - cp ${WRKSRC}/scripts/run_daemon ${PREFIX} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/Minerva + @ ${MKDIR} -p ${PREFIX}/etc/rc.d + @ if [ ! -f ${PREFIX}/etc/rc.d/msql.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/msql.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql.sh; \ + echo "[ -x ${PREFIX}/Minerva/bin/msqld ] && ${PREFIX}/Minerva/bin/msqld & && echo -n ' msql'" >> ${PREFIX}/etc/rc.d/msql.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/msql.sh; \ + fi .include diff --git a/databases/msql/files/patch-aa b/databases/msql/files/patch-aa index 7de800054139..f59b15c633e8 100644 --- a/databases/msql/files/patch-aa +++ b/databases/msql/files/patch-aa @@ -1,33 +1,22 @@ -*** Makefile.orig Tue Feb 7 17:03:58 1995 ---- Makefile Wed Feb 22 18:04:45 1995 -*************** -*** 18,29 **** - SHELL=/bin/sh - - all: -! @ echo ""; echo "You have not read the installation procedures.";\ -! echo "Please read the README file for build instructions.";\ -! echo - - target: - @ scripts/make-target - - - ---- 18,33 ---- - SHELL=/bin/sh - - all: -! cd targets/freebsd ;\ -! make all -! -! install: -! cd targets/freebsd ;\ -! make install - - target: - @ scripts/make-target -+ @ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd) - - - +--- Makefile.orig Tue Feb 7 20:03:58 1995 ++++ Makefile Thu Oct 3 20:08:24 1996 +@@ -18,12 +18,16 @@ + SHELL=/bin/sh + + all: +- @ echo ""; echo "You have not read the installation procedures.";\ +- echo "Please read the README file for build instructions.";\ +- echo ++ cd targets/freebsd ;\ ++ make all ++ ++install: ++ cd targets/freebsd ;\ ++ make install + + target: + @ scripts/make-target ++ @ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd) + + + diff --git a/databases/msql/files/patch-ab b/databases/msql/files/patch-ab index 9ab38443ed83..11a6ecd56e3d 100644 --- a/databases/msql/files/patch-ab +++ b/databases/msql/files/patch-ab @@ -1,19 +1,54 @@ -*** src/setup.orig Wed Feb 22 18:16:06 1995 ---- src/setup Wed Feb 22 18:16:20 1995 -*************** -*** 47,53 **** - fi - - -! PID_DIRS="/var/adm /var/log /usr/adm /private/adm" - PID_DIR="" - for dir in $PID_DIRS - do ---- 47,53 ---- - fi - - -! PID_DIRS="/var/run /var/adm /var/log /usr/adm /private/adm" - PID_DIR="" - for dir in $PID_DIRS - do +--- src/setup.orig Wed Jun 19 09:30:27 1996 ++++ src/setup Thu Oct 3 20:11:48 1996 +@@ -28,47 +28,10 @@ + echo " or symbolic paths such as ~user/msql will not work" + echo + echo +-$ECHO_N " Top of install tree ? [/usr/local/Minerva] $ECHO_C" +-read INST_TOP +-if test "$INST_TOP." = "." +-then +- INST_TOP=/usr/local/Minerva +-fi +- +-$ECHO_N " Will this installation be running as root ? [y] $ECHO_C" +-read ANS +-if test "$ANS." = "." +-then +- ANS="y" +-fi +-if echo $ANS | grep -i "y" > /dev/null +-then +- ROOT_EXEC="-DROOT_EXEC" +- ROOT="root" +-else +- ROOT_EXEC="" +- $ECHO_N " What username will it run under ? $ECHO_C" +- read ROOT +-fi +- +- +-PID_DIRS="/var/adm /var/log /usr/adm /private/adm" +-PID_DIR="" +-for dir in $PID_DIRS +-do +- if test -d $dir +- then +- PID_DIR=${dir} +- break +- fi +-done +-$ECHO_N " Directory for pid file ? [${PID_DIR}] $ECHO_C" +-read RESPONSE +-if test "$RESPONSE." != "." +-then +- PID_DIR=$RESPONSE +-fi +- ++INST_TOP=$PREFIX/Minerva ++ROOT_EXEC="-DROOT_EXEC" ++ROOT="root" ++PID_DIR=/var/run + + echo + echo diff --git a/databases/msql/files/patch-ac b/databases/msql/files/patch-ac index dcf4a08abea8..cd4abbf21a02 100644 --- a/databases/msql/files/patch-ac +++ b/databases/msql/files/patch-ac @@ -1,36 +1,21 @@ -*** scripts/run_daemon.orig Mon Dec 18 20:27:42 1995 ---- scripts/run_daemon Sun Jul 21 22:15:25 1996 -*************** -*** 9,16 **** - # - # bambi@Bond.edu.au - -! INST_DIR=/usr/local/Minerva -! ADMIN="you@some.machine" - PROG=$1 - - if test ! -d "${INST_DIR}/debug" ---- 9,16 ---- - # - # bambi@Bond.edu.au - -! INST_DIR=@@PREFIX@@ -! ADMIN="root@@@HOSTNAME@@" - PROG=$1 - - if test ! -d "${INST_DIR}/debug" -*************** -*** 34,39 **** - - " > mail.tmp - cat output >> mail.tmp -! /usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp - sleep 15 - done ---- 34,39 ---- - - " > mail.tmp - cat output >> mail.tmp -! /usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp - sleep 15 - done +--- scripts/run_daemon.orig Mon Dec 18 20:27:42 1995 ++++ scripts/run_daemon Thu Oct 3 20:08:24 1996 +@@ -9,8 +9,8 @@ + # + # bambi@Bond.edu.au + +-INST_DIR=/usr/local/Minerva +-ADMIN="you@some.machine" ++INST_DIR=@@PREFIX@@ ++ADMIN="root@@@HOSTNAME@@" + PROG=$1 + + if test ! -d "${INST_DIR}/debug" +@@ -34,6 +34,6 @@ + + " > mail.tmp + cat output >> mail.tmp +- /usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp ++ /usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp + sleep 15 + done diff --git a/databases/msql/pkg-plist b/databases/msql/pkg-plist index db5bd828c283..b5a6a1d1055f 100644 --- a/databases/msql/pkg-plist +++ b/databases/msql/pkg-plist @@ -1,20 +1,29 @@ -@cd /usr/local/Minerva -run_daemon -bin/msql -bin/msqld -bin/msqladmin -bin/relshow -bin/msqldump -include/msql.h -lib/libmsql.a -doc/HISTORY -doc/Commercial -doc/License -doc/acl.txt -doc/mSQL-1.0.11.ps -doc/mSQL-Invoice.txt -doc/msql-pwr.README -doc/msql-pwr.gif -doc/msql-pwr2.gif -msql.acl.sample +etc/rc.d/msql.sh +Minerva/run_daemon +Minerva/bin/msql +Minerva/bin/msqld +Minerva/bin/msqladmin +Minerva/bin/relshow +Minerva/bin/msqldump +Minerva/include/msql.h +Minerva/lib/libmsql.a +Minerva/doc/HISTORY +Minerva/doc/Commercial +Minerva/doc/License +Minerva/doc/License.mSQL +Minerva/doc/acl.txt +Minerva/doc/mSQL-1.0.11.ps +Minerva/doc/mSQL-Invoice.txt +Minerva/doc/mSQL-Invoice.ps +Minerva/doc/msql-pwr.README +Minerva/doc/msql-pwr.gif +Minerva/doc/msql-pwr2.gif +Minerva/msql.acl.sample @exec mkdir -p %D/msqldb/.tmp +@dirrm Minerva/bin +@dirrm Minerva/lib +@dirrm Minerva/include +@dirrm Minerva/doc +@dirrm Minerva/msqldb/.tmp +@dirrm Minerva/msqldb +@dirrm Minerva diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile index ad4462b8fa2a..88830dfdb64a 100644 --- a/databases/msql3/Makefile +++ b/databases/msql3/Makefile @@ -1,31 +1,37 @@ # New ports collection makefile for: msql -# Version required: 1.0.14 +# Version required: 1.0.16 # Date created: 14 January 1995 # Whom: mr (original) # -# $Id$ +# $Id: Makefile,v 1.12 1996/08/29 10:20:55 asami Exp $ # DISTNAME= msql-1.0.16 CATEGORIES+= databases MASTER_SITES= ftp://bond.edu.au/pub/Minerva/msql/ -MAINTAINTER= jfitz@freebsd.org +MAINTAINTER= jfitz@FreeBSD.ORG -IS_INTERACTIVE= yes -PREFIX= /usr/local/Minerva +#IS_INTERACTIVE= yes NO_MTREE= yes RESTRICTED= "restrictive copyright (no commercial use)" post-install: .for file in Commercial License mSQL-Invoice.txt msql-pwr.README msql-pwr.gif msql-pwr2.gif - cp ${WRKSRC}/doc/${file} ${PREFIX}/doc + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/Minerva/doc .endfor .if !defined(NOPORTDOCS) .for file in HISTORY acl.txt mSQL-1.0.11.ps - cp ${WRKSRC}/doc/${file} ${PREFIX}/doc + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/Minerva/doc .endfor .endif - cp ${WRKSRC}/scripts/run_daemon ${PREFIX} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/Minerva + @ ${MKDIR} -p ${PREFIX}/etc/rc.d + @ if [ ! -f ${PREFIX}/etc/rc.d/msql.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/msql.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql.sh; \ + echo "[ -x ${PREFIX}/Minerva/bin/msqld ] && ${PREFIX}/Minerva/bin/msqld & && echo -n ' msql'" >> ${PREFIX}/etc/rc.d/msql.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/msql.sh; \ + fi .include diff --git a/databases/msql3/files/patch-aa b/databases/msql3/files/patch-aa index 7de800054139..f59b15c633e8 100644 --- a/databases/msql3/files/patch-aa +++ b/databases/msql3/files/patch-aa @@ -1,33 +1,22 @@ -*** Makefile.orig Tue Feb 7 17:03:58 1995 ---- Makefile Wed Feb 22 18:04:45 1995 -*************** -*** 18,29 **** - SHELL=/bin/sh - - all: -! @ echo ""; echo "You have not read the installation procedures.";\ -! echo "Please read the README file for build instructions.";\ -! echo - - target: - @ scripts/make-target - - - ---- 18,33 ---- - SHELL=/bin/sh - - all: -! cd targets/freebsd ;\ -! make all -! -! install: -! cd targets/freebsd ;\ -! make install - - target: - @ scripts/make-target -+ @ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd) - - - +--- Makefile.orig Tue Feb 7 20:03:58 1995 ++++ Makefile Thu Oct 3 20:08:24 1996 +@@ -18,12 +18,16 @@ + SHELL=/bin/sh + + all: +- @ echo ""; echo "You have not read the installation procedures.";\ +- echo "Please read the README file for build instructions.";\ +- echo ++ cd targets/freebsd ;\ ++ make all ++ ++install: ++ cd targets/freebsd ;\ ++ make install + + target: + @ scripts/make-target ++ @ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd) + + + diff --git a/databases/msql3/files/patch-ab b/databases/msql3/files/patch-ab index 9ab38443ed83..11a6ecd56e3d 100644 --- a/databases/msql3/files/patch-ab +++ b/databases/msql3/files/patch-ab @@ -1,19 +1,54 @@ -*** src/setup.orig Wed Feb 22 18:16:06 1995 ---- src/setup Wed Feb 22 18:16:20 1995 -*************** -*** 47,53 **** - fi - - -! PID_DIRS="/var/adm /var/log /usr/adm /private/adm" - PID_DIR="" - for dir in $PID_DIRS - do ---- 47,53 ---- - fi - - -! PID_DIRS="/var/run /var/adm /var/log /usr/adm /private/adm" - PID_DIR="" - for dir in $PID_DIRS - do +--- src/setup.orig Wed Jun 19 09:30:27 1996 ++++ src/setup Thu Oct 3 20:11:48 1996 +@@ -28,47 +28,10 @@ + echo " or symbolic paths such as ~user/msql will not work" + echo + echo +-$ECHO_N " Top of install tree ? [/usr/local/Minerva] $ECHO_C" +-read INST_TOP +-if test "$INST_TOP." = "." +-then +- INST_TOP=/usr/local/Minerva +-fi +- +-$ECHO_N " Will this installation be running as root ? [y] $ECHO_C" +-read ANS +-if test "$ANS." = "." +-then +- ANS="y" +-fi +-if echo $ANS | grep -i "y" > /dev/null +-then +- ROOT_EXEC="-DROOT_EXEC" +- ROOT="root" +-else +- ROOT_EXEC="" +- $ECHO_N " What username will it run under ? $ECHO_C" +- read ROOT +-fi +- +- +-PID_DIRS="/var/adm /var/log /usr/adm /private/adm" +-PID_DIR="" +-for dir in $PID_DIRS +-do +- if test -d $dir +- then +- PID_DIR=${dir} +- break +- fi +-done +-$ECHO_N " Directory for pid file ? [${PID_DIR}] $ECHO_C" +-read RESPONSE +-if test "$RESPONSE." != "." +-then +- PID_DIR=$RESPONSE +-fi +- ++INST_TOP=$PREFIX/Minerva ++ROOT_EXEC="-DROOT_EXEC" ++ROOT="root" ++PID_DIR=/var/run + + echo + echo diff --git a/databases/msql3/files/patch-ac b/databases/msql3/files/patch-ac index dcf4a08abea8..cd4abbf21a02 100644 --- a/databases/msql3/files/patch-ac +++ b/databases/msql3/files/patch-ac @@ -1,36 +1,21 @@ -*** scripts/run_daemon.orig Mon Dec 18 20:27:42 1995 ---- scripts/run_daemon Sun Jul 21 22:15:25 1996 -*************** -*** 9,16 **** - # - # bambi@Bond.edu.au - -! INST_DIR=/usr/local/Minerva -! ADMIN="you@some.machine" - PROG=$1 - - if test ! -d "${INST_DIR}/debug" ---- 9,16 ---- - # - # bambi@Bond.edu.au - -! INST_DIR=@@PREFIX@@ -! ADMIN="root@@@HOSTNAME@@" - PROG=$1 - - if test ! -d "${INST_DIR}/debug" -*************** -*** 34,39 **** - - " > mail.tmp - cat output >> mail.tmp -! /usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp - sleep 15 - done ---- 34,39 ---- - - " > mail.tmp - cat output >> mail.tmp -! /usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp - sleep 15 - done +--- scripts/run_daemon.orig Mon Dec 18 20:27:42 1995 ++++ scripts/run_daemon Thu Oct 3 20:08:24 1996 +@@ -9,8 +9,8 @@ + # + # bambi@Bond.edu.au + +-INST_DIR=/usr/local/Minerva +-ADMIN="you@some.machine" ++INST_DIR=@@PREFIX@@ ++ADMIN="root@@@HOSTNAME@@" + PROG=$1 + + if test ! -d "${INST_DIR}/debug" +@@ -34,6 +34,6 @@ + + " > mail.tmp + cat output >> mail.tmp +- /usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp ++ /usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp + sleep 15 + done diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist index db5bd828c283..b5a6a1d1055f 100644 --- a/databases/msql3/pkg-plist +++ b/databases/msql3/pkg-plist @@ -1,20 +1,29 @@ -@cd /usr/local/Minerva -run_daemon -bin/msql -bin/msqld -bin/msqladmin -bin/relshow -bin/msqldump -include/msql.h -lib/libmsql.a -doc/HISTORY -doc/Commercial -doc/License -doc/acl.txt -doc/mSQL-1.0.11.ps -doc/mSQL-Invoice.txt -doc/msql-pwr.README -doc/msql-pwr.gif -doc/msql-pwr2.gif -msql.acl.sample +etc/rc.d/msql.sh +Minerva/run_daemon +Minerva/bin/msql +Minerva/bin/msqld +Minerva/bin/msqladmin +Minerva/bin/relshow +Minerva/bin/msqldump +Minerva/include/msql.h +Minerva/lib/libmsql.a +Minerva/doc/HISTORY +Minerva/doc/Commercial +Minerva/doc/License +Minerva/doc/License.mSQL +Minerva/doc/acl.txt +Minerva/doc/mSQL-1.0.11.ps +Minerva/doc/mSQL-Invoice.txt +Minerva/doc/mSQL-Invoice.ps +Minerva/doc/msql-pwr.README +Minerva/doc/msql-pwr.gif +Minerva/doc/msql-pwr2.gif +Minerva/msql.acl.sample @exec mkdir -p %D/msqldb/.tmp +@dirrm Minerva/bin +@dirrm Minerva/lib +@dirrm Minerva/include +@dirrm Minerva/doc +@dirrm Minerva/msqldb/.tmp +@dirrm Minerva/msqldb +@dirrm Minerva -- cgit v1.2.3