Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77164 by Treeve Jelbert for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77164 by Treeve Jelbert for review
  • Date: Mon, 3 Apr 2006 19:50:01 +0100 (BST)

Change 77164 by treeve_jelbert@treeve-knowhow on 2006/04/03 19:46:11

mgetty-1.1.35-Feb22

Affected files ...

... //sgl/grimoires/test/printer/mgetty/BUILD#2 integrate
... //sgl/grimoires/test/printer/mgetty/CONFIGURE#2 integrate
... //sgl/grimoires/test/printer/mgetty/DEPENDS#2 integrate
... //sgl/grimoires/test/printer/mgetty/DETAILS#4 integrate
... //sgl/grimoires/test/printer/mgetty/FINAL#1 branch
... //sgl/grimoires/test/printer/mgetty/HISTORY#6 integrate
... //sgl/grimoires/test/printer/mgetty/INSTALL#1 branch
... //sgl/grimoires/test/printer/mgetty/Makefile.callback.patch#2 delete
... //sgl/grimoires/test/printer/mgetty/Makefile.dialog.patch#2 delete
... //sgl/grimoires/test/printer/mgetty/Makefile.patch#2 delete
... //sgl/grimoires/test/printer/mgetty/Makefile.tools.patch#2 delete
... //sgl/grimoires/test/printer/mgetty/Makefile.viewfax.patch#2 delete
... //sgl/grimoires/test/printer/mgetty/POST_INSTALL#2 delete
... //sgl/grimoires/test/printer/mgetty/PRE_BUILD#1 branch
... //sgl/grimoires/test/printer/mgetty/mk.diff#1 branch

Differences ...

==== //sgl/grimoires/test/printer/mgetty/BUILD#2 (xtext) ====

@@ -1,132 +1,35 @@
-(
-
- ##########################################
- ## Patching and initial configuration ##
- ##########################################
-
- create_account phone &&
-
- export MGETTY_CFLAGS=${CFLAGS} &&
-
- cp policy.h-dist policy.h &&
- patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
-
- case $LOGIN_PATCH in
- y|Y|j|J)
- patch -p0 < $SCRIPT_DIRECTORY/policy.h.misc.patch
- ;;
- *)
- true
- ;;
- esac &&
-
- case $NEWFAX_PATCH in
- y|Y|j|J)
- patch -p0 < $SCRIPT_DIRECTORY/policy.h.new_fax.patch
- ;;
- *)
- true
- ;;
- esac &&
-
###################################
## Build the selected packages ##
###################################

make &&

- if grep -q 'INCLUDE_CALLBACK="y"' ${SPELL_CONFIG}; then
+ if [ $INCLUDE_CALLBACK=="y" ] ; then
cd callback/ &&
- patch -p0 < $SCRIPT_DIRECTORY/Makefile.callback.patch &&
make &&
cd ../
fi &&

- if grep -q 'INCLUDE_DIALOG="y"' ${SPELL_CONFIG}; then
+ if [ $INCLUDE_DIALOG=="y" ] ; then
cd frontends/dialog/ &&
- patch -p0 < $SCRIPT_DIRECTORY/Makefile.dialog.patch &&
make &&
cd ../../
fi &&

- if grep -q 'INCLUDE_VIEWFAX="y"' ${SPELL_CONFIG}; then
- cd frontends/X11/viewfax-2.5/ &&
- patch -p0 < $SCRIPT_DIRECTORY/Makefile.viewfax.patch &&
+ if [ $INCLUDE_VIEWFAX=="y" ] ; then
+ cd frontends/X11/viewfax*/ &&
xmkmf &&
make &&
make depend &&
cd ../../../
fi &&

- if grep -q 'INCLUDE_TOOLS="y"' ${SPELL_CONFIG}; then
+ if [ $INCLUDE_TOOLS=="y" ] ; then
cd tools/ &&
- patch -p0 < $SCRIPT_DIRECTORY/Makefile.tools.patch &&
make &&
cd ../
fi &&

- if grep -q 'INCLUDE_VGETTY="y"' ${SPELL_CONFIG}; then
+ if [ $INCLUDE_VGETTY=="y" ] ; then
make vgetty
- fi &&
-
- #####################################
- ## Install the selected packages ##
- #####################################
-
- prepare_install &&
- make install &&
-
- if grep -q 'INCLUDE_CALLBACK="y"' ${SPELL_CONFIG}; then
- cd callback/ &&
- make install &&
- cd ../
- fi &&
-
- if grep -q 'INCLUDE_DIALOG="y"' ${SPELL_CONFIG}; then
- cd frontends/dialog/ &&
- make install &&
- cd ../../
- fi &&
-
- if grep -q 'INCLUDE_TCLTK="y"' ${SPELL_CONFIG}; then
- cd frontends/tcl/faxview-0.2/ &&
- sedit "s:/usr/local/bin/wish:/usr/bin/wish:g" faxview.tcl &&
- install -m 755 faxview.tcl /usr/bin/faxview &&
- install -m 444 faxview.man /usr/man/man1/faxview.1 &&
- cd ../../../
- fi &&
-
- if grep -q 'INCLUDE_VIEWFAX="y"' ${SPELL_CONFIG}; then
- cd frontends/X11/viewfax-2.5/ &&
- make install &&
- make install.man &&
- cd ../../../
- fi &&
-
- if grep -q 'INCLUDE_SAMPLES="y"' ${SPELL_CONFIG}; then
- if ! [ -d /usr/share/mgetty ]; then
- mkdir -p /usr/share/mgetty/ &&
- cp -r samples/ /usr/share/mgetty/
- fi
- fi &&
-
- if grep -q 'INCLUDE_TOOLS="y"' ${SPELL_CONFIG}; then
- cd tools/ &&
- make install &&
- cd ../
- fi &&
-
- if grep -q 'INCLUDE_VGETTY="y"' ${SPELL_CONFIG}; then
- make vgetty-install
- fi &&
-
- ###########################
- ## Final configuration ##
- ###########################
-
- if [ -e /var/spool/fax ]; then
- chown -R phone.phone /var/spool/fax/ &&
- chmod -R 770 /var/spool/fax/
fi
-
-) > $C_FIFO 2>&1

==== //sgl/grimoires/test/printer/mgetty/CONFIGURE#2 (xtext) ====

@@ -1,16 +1,11 @@
-if ! grep -q 'CONFIGURED=\"y\"' ${DEPENDS_CONFIG}/mgetty; then
- ############################################################
- ## Start mgetty on boot?
- if query "Start mgetty on system boot? " y; then
- echo 'START_ON_BOOT="y"' >> ${SPELL_CONFIG}
-
- ############################################################
+ config_query START_ON_BOOT "Start mgetty on system boot? " y
+ if [ $START_ON_BOOT == "y" ] ;then
## Set the TTY device to be used for mgetty.
if ! [ -e /dev/ttyS0 ]; then
- message "${PROBLEM_COLOR}You have selected to start mgetty on system
boot, but you do not have any serial ports setup on this system. Please
enable at least one serial port in BIOS and your kernel and then recast this
spell.${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}No serail port available. Fix your BIOS or
kernel.${DEFAULT_COLOR}"
return 1
fi
-
+ local COUNTER TTY_DEVICE
COUNTER=0

while [ "${TTY_DEVICE}" == "" ]; do
@@ -38,83 +33,28 @@
done

############################################################
- ## Set the number of rings to answer on.
- message "${MESSAGE_COLOR}Type in the number of rings to answer on (the
default is 2):${DEFAULT_COLOR}"
- read -t ${PROMPT_DELAY} -e
- NUM_RINGS=${REPLY:=2}
- echo "NUM_RINGS=${NUM_RINGS}" >> ${SPELL_CONFIG}
+ config_query NUM_RINGS "number of rings to answer on" 2

############################################################
# Setup final init string
+ persistent_add INITTAB_STRING
INITTAB_STRING="${TTY_DEVICE:5}:linux:${INSTALL_ROOT}/usr/sbin/mgetty -n
${NUM_RINGS} ${TTY_DEVICE}"
- echo "INITTAB_STRING=\"${INITTAB_STRING}\"" >> ${SPELL_CONFIG}

- else
- echo 'START_ON_BOOT="n"' >> ${SPELL_CONFIG}
- fi
+ fi #boot


############################################################
## Select the options to enable.
- if query "Apply login prompt and login timeout patch? " n; then
- LOGIN_PATCH="y"
- else
- LOGIN_PATCH="n"
- fi
- echo "LOGIN_PATCH=${LOGIN_PATCH}" >> ${SPELL_CONFIG}
+ config_query LOGIN_PATCH " Apply login prompt and login timeout patch? " y
+ config_query NEWFAX_PATCH "run new_fax script for every new faxed
received?" n

- if query "Apply patch to execute the new_fax script for every new faxed
received? " y; then
- echo 'NEWFAX_PATCH="y"' >> ${SPELL_CONFIG}
- NEWFAX_PATCH="y"
- else
- echo 'NEWFAX_PATCH="n"' >> ${SPELL_CONFIG}
- fi
-

############################################################
## Select the optional programs to install.
- if query "Install the included callback utility? " y; then
- echo 'INCLUDE_CALLBACK="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_CALLBACK="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install some dialog-based utilities to view the fax queue and to
listen to voice messages? " y; then
- echo 'INCLUDE_DIALOG="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_DIALOG="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install faxview for a tcl/tk-based fax viewer? " y; then
- echo 'INCLUDE_TCLTK="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_TCLTK="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install viewfax for a X-based fax viewer? " y; then
- echo 'INCLUDE_VIEWFAX="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_VIEWFAX="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install the included samples? " y; then
- echo 'INCLUDE_SAMPLES="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_SAMPLES="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install the misc. tools (cutbl, kvg, ltest and mid)? " y; then
- echo 'INCLUDE_TOOLS="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_TOOLS="n"' >> ${SPELL_CONFIG}
- fi
-
- if query "Install vgetty to add voice mail capabilities? " y; then
- echo 'INCLUDE_VGETTY="y"' >> ${SPELL_CONFIG}
- else
- echo 'INCLUDE_VGETTY="n"' >> ${SPELL_CONFIG}
- fi
-
-
- echo 'CONFIGURED="y"' >> ${SPELL_CONFIG}
-fi
+ config_query INCLUDE_CALLBACK "Install the included callback utility? " n
+ config_query INCLUDE_SAMPLES "Install the included samples? " n
+ config_query INCLUDE_TOOLS "Install the misc. tools (cutbl, kvg, ltest and
mid)? " y
+ config_query INCLUDE_VGETTY "Install vgetty to add voice mail
capabilities? " y
+ config_query INCLUDE_VIEWFAX "X-based fax viewer?" n
+ config_query INCLUDE_TCLTK "tcl/tk-based fax viewer?" n
+ config_query INCLUDE_DIALOG "view the fax queue and to listen to voice
messages" n

==== //sgl/grimoires/test/printer/mgetty/DEPENDS#2 (xtext) ====

@@ -1,12 +1,12 @@
-if grep -q 'INCLUDE_DIALOG="y"' ${SPELL_CONFIG}; then
+if [ $INCLUDE_DIALOG == "y" ]; then
depends dialog
-fi &&
+fi &&

-if grep -q 'INCLUDE_TCLTK="y"' ${SPELL_CONFIG}; then
+if [ $INCLUDE_TCLTK == "y" ]; then
depends tk
-fi &&
+fi &&

-if grep -q 'INCLUDE_VIEWFAX="y"' ${SPELL_CONFIG}; then
+if [ $INCLUDE_VIEWFAX == "y" ]; then
depends X11-LIBS
fi


==== //sgl/grimoires/test/printer/mgetty/DETAILS#4 (xtext) ====

@@ -1,10 +1,11 @@
SPELL=mgetty
- VERSION=1.1.31-Jul24
+ VERSION=1.1.35-Feb22
+ BUILD_API=2
SOURCE=${SPELL}${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION/-*/}
- SOURCE_URL[0]=ftp://alpha.greenie.net/pub/$SPELL/source/1.1/${SOURCE}
-
SOURCE_HASH=sha512:2aafafd8d91dcf6937a228b21a4f04981f6e54ea47c7e57d56fbf2c69f8ed9f11eafd19ecc0d9a0c41ccffbc78b636592a414d6baf41c6d9eaf1bc5ed2e6d211
- WEB_SITE=http://alpha.greenie.net/${SPELL}
+ SOURCE_URL[0]=ftp://mgetty.greenie.net/pub/$SPELL/source/1.1/${SOURCE}
+
SOURCE_HASH=sha512:2451b7a31c3fc6f58d2a69b2aed80d243833ba30f8e3409e5625e02e6a087ca1448ae808c1fa6c41e5d939ddc10fd24e2405910780a875b80868be506104923c
+ WEB_SITE=http://mgetty.greenie.net
ENTERED=20020927
UPDATED=20020927
LICENSE[0]=GPL

==== //sgl/grimoires/test/printer/mgetty/HISTORY#6 (text) ====

@@ -1,3 +1,13 @@
+2006-04-03 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.1.35-Feb22
+ BUILD_API=2
+ change url
+ * POST_INSTALL: rename as FINAL
+ * DEPENDS: test persistent variables
+ * CONFIGURE: delete some prompts, convert others to config_query
+ * Makefile.*.patch: deleted
+ * mk.diff: added
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS




  • [SM-Commit] PERFORCE change 77164 by Treeve Jelbert for review, Perforce Review Daemon, 04/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page