sync ./printer/pnm2ppa from stable-rc 0.4

7 files changed, 59 insertions, 23 deletions

diff --git a/printer/pnm2ppa/BUILD b/printer/pnm2ppa/BUILD
index 8d6c4d2ec1..8f58e6df93 100755
--- a/printer/pnm2ppa/BUILD
+++ b/printer/pnm2ppa/BUILD
@@ -1,17 +1 @@
-leave_config()  {
-  if  [  -f  ${INSTALL_ROOT}/etc/pnm2ppa.conf  ];  then
-    sedit  "s/^.*INSTALL.*pnm2ppa.conf.*$/#/"  Makefile
-  fi
-}
-
-(
-
-  sedit  "s:-O2 :$CFLAGS :"  Makefile                     &&
-  sedit  "s:/usr/local/:${INSTALL_ROOT}/usr/:"  Makefile  &&
-
-  make                                                    &&
-  prepare_install                                         &&
-  leave_config                                            &&
-  make    install
-
-) > $C_FIFO 2>&1
+make
diff --git a/printer/pnm2ppa/CONFIGURE b/printer/pnm2ppa/CONFIGURE
new file mode 100755
index 0000000000..8663dd09ce
--- /dev/null
+++ b/printer/pnm2ppa/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_list  PNM2PPA_PRINTER_MODEL                                    \
+                   "Which printer model would you like to be the default?"  \
+                   "720 Series (710C, 720C, 722C)"                            \
+                   "820 Series (820Cse, 820Cxi)"                              \
+                   "1000 Series (1000Cse, 1000Cxi)"                           &&
+
+config_query_list  PNM2PPA_MEDIA_SIZE                                    \
+                   "Which media size would you like to be the default?"  \
+                   Letter                                                \
+                   A4                                                    \
+                   Legal
diff --git a/printer/pnm2ppa/DEPENDS b/printer/pnm2ppa/DEPENDS
index a6d45d3b12..685ebad9bd 100755
--- a/printer/pnm2ppa/DEPENDS
+++ b/printer/pnm2ppa/DEPENDS
@@ -1,5 +1 @@
-if  !  spell_ok  ghostscript  &&  !  spell_ok  espgs;  then
-  message  "\n${PROBLEM_COLOR}  **  Do NOT choose ghostscript if you have installed or are installing cups:  **  ${DEFAULT_COLOR}\n"
-fi  &&
-
 depends  POSTSCRIPT-INTERPRETER
diff --git a/printer/pnm2ppa/DETAILS b/printer/pnm2ppa/DETAILS
index 10780d7d80..50caf6b71e 100755
--- a/printer/pnm2ppa/DETAILS
+++ b/printer/pnm2ppa/DETAILS
@@ -5,10 +5,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
         WEB_SITE=http://pnm2ppa.sourceforge.net
       LICENSE[0]=GPL
-          MD5[0]=dc7b3e0be56a776fa8242d23ebd34c70
+       BUILD_API=2
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
          ENTERED=20020405
          UPDATED=20020405
-      MAINTAINER=djcomputer@gmx.net
            SHORT="HP PPA GhostScript printfilter"
 cat << EOF
 
diff --git a/printer/pnm2ppa/HISTORY b/printer/pnm2ppa/HISTORY
index 15f4145954..d11497826a 100644
--- a/printer/pnm2ppa/HISTORY
+++ b/printer/pnm2ppa/HISTORY
@@ -1,3 +1,11 @@
+2005-10-23 Jason Flatt <jflatt@sourcemage.org>
+	* BUILD, DETAILS, PRE_BUILD: Upgrade to BUILD_API 2.
+	* CONFIGURE: Added some options to automatically setting up the .conf
+	  file.
+	* DETAILS, pnm2ppa-1.12.tar.gz.sig: Converted to GPG checking.
+	* DETAILS: Removed MAINTAINER field.
+	* DEPENDS: Removed prostscript warning.
+
 2005-01-29 Arjan Bouter <abouter@sourcemage.org>
 	* DEPENDS: spell_installed -> spell_ok conversion
 
diff --git a/printer/pnm2ppa/PRE_BUILD b/printer/pnm2ppa/PRE_BUILD
new file mode 100755
index 0000000000..774a18a645
--- /dev/null
+++ b/printer/pnm2ppa/PRE_BUILD
@@ -0,0 +1,37 @@
+default_pre_build                                       &&
+cd  ${SOURCE_DIRECTORY}                                 &&
+
+sedit  "s:-O2 :$CFLAGS :"  Makefile                     &&
+sedit  "s:/usr/local/:${INSTALL_ROOT}/usr/:"  Makefile  &&
+
+if  [  -f  ${INSTALL_ROOT}/etc/pnm2ppa.conf  ]
+then
+  sedit  "s/^.*INSTALL.*pnm2ppa.conf.*$/#/"  Makefile
+else
+  case "${PNM2PPA_PRINTER_MODEL}" in
+     "720 Series (710C, 720C, 722C)")
+      sedit  "s:version 0:#version 0:"        pnm2ppa.conf
+      sedit  "s:#version  720:version  720:"  pnm2ppa.conf
+      ;;
+     "820 Series (820Cse, 820Cxi)")
+      sedit  "s:version 0:#version 0:"        pnm2ppa.conf
+      sedit  "s:#version  820:version  820:"  pnm2ppa.conf
+      ;;
+    "1000 Series (1000Cse, 1000Cxi)")
+      sedit  "s:version 0:#version 0:"        pnm2ppa.conf
+      sedit  "s:#version 1000:version 1000:"  pnm2ppa.conf
+      ;;
+  esac
+
+  case "${PNM2PPA_MEDIA_SIZE}" in
+    Letter)
+      sedit  "s:#papersize letter:papersize letter:"  pnm2ppa.conf
+      ;;
+        A4)
+      sedit  "s:#papersize a4:papersize a4:"          pnm2ppa.conf
+      ;;
+     Legal)
+      sedit  "s:#papersize legal#papersize legal:"    pnm2ppa.conf
+      ;;
+  esac
+fi
diff --git a/printer/pnm2ppa/pnm2ppa-1.12.tar.gz.sig b/printer/pnm2ppa/pnm2ppa-1.12.tar.gz.sig
new file mode 100644
index 0000000000..fdadc3cef4
--- /dev/null
+++ b/printer/pnm2ppa/pnm2ppa-1.12.tar.gz.sig