diff options
| author | Treeve Jelbert | 2006-06-25 13:09:41 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2006-06-25 13:09:41 +0200 |
| commit | d6bb1c1589eec80a4f722327f7e386d1b666fd5c (patch) | |
| tree | 6b628669f798eaa1b8985747c45f7d1df46bc888 | |
| parent | 4673d2b2efd7263e06b54c85c34eb0bc7748485c (diff) | |
| parent | 9cc74572e8e31612e231c3bc6111e46197d71b82 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
78 files changed, 199 insertions, 53 deletions
diff --git a/0x539.gpg b/0x539.gpg Binary files differnew file mode 100644 index 0000000000..8ec71dcd23 --- /dev/null +++ b/0x539.gpg diff --git a/disk/netatalk/DEPENDS b/disk/netatalk/DEPENDS index 69bd0e8b1c..f5a667de3a 100755 --- a/disk/netatalk/DEPENDS +++ b/disk/netatalk/DEPENDS @@ -33,7 +33,7 @@ optional_depends shadow \ # "--disable-pgp-uam" \ # "for PGP UAM module" && -optional_depends cups \ +optional_depends CUPS \ "--enable-cups" \ "--disable-cups" \ "for CUPS support" diff --git a/disk/netatalk/HISTORY b/disk/netatalk/HISTORY index 27071cbfd5..0307f7ef2f 100644 --- a/disk/netatalk/HISTORY +++ b/disk/netatalk/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2005-01-23 Arjan Bouter <abouter@sourcemage.org> * lowercase linux-pam diff --git a/editors/auctex/DETAILS b/editors/auctex/DETAILS index c7d24f45b8..220f4214b3 100755 --- a/editors/auctex/DETAILS +++ b/editors/auctex/DETAILS @@ -1,13 +1,12 @@ SPELL=auctex BUILD_API=2 - VERSION=11.82 + VERSION=11.83 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE2=${SOURCE}.sig SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=${GNU_URL}/${SPELL}/${SOURCE} SOURCE2_URL[0]=${GNU_URL}/${SPELL}/${SOURCE2} - SOURCE_GPG=gnu.gpg:${SOURCE2} - SOURCE_HASH=sha512:9fa1480518a8422e9e544cd5fb5e56c82ba57d7f7c41adf9fee03899ac87f1677accccc61a22dca504e97f3c3e8b48f2faa689214b31df5fba1e6b78a032fbea + SOURCE_GPG=gnu.gpg:${SOURCE2}:UPSTREAM_KEY SOURCE2_IGNORE=signature WEB_SITE=http://www.gnu.org/software/auctex/ LICENSE[0]=GPL diff --git a/editors/auctex/HISTORY b/editors/auctex/HISTORY index e91a2c0d04..9c1ebc771c 100644 --- a/editors/auctex/HISTORY +++ b/editors/auctex/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: updated to 11.83 + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/editors/emacs-wiki/DEPENDS b/editors/emacs-wiki/DEPENDS index 5b47e1e89a..b6ff1f7ab4 100755 --- a/editors/emacs-wiki/DEPENDS +++ b/editors/emacs-wiki/DEPENDS @@ -1,2 +1 @@ -depends "tla" && -depends "emacs" +depends "EMACS" diff --git a/editors/emacs-wiki/DETAILS b/editors/emacs-wiki/DETAILS index d8c785ea4d..ffb1a30def 100755 --- a/editors/emacs-wiki/DETAILS +++ b/editors/emacs-wiki/DETAILS @@ -1,10 +1,13 @@ SPELL=emacs-wiki - VERSION=1.0.33 - SOURCE=emacs-wiki-$VERSION.tar.bz2 + VERSION=2.71 + SOURCE=emacs-wiki-$VERSION.tar.gz + SOURCE2=${SOURCE}.sig SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]="tla://http://sacha.free.net.ph/notebook/arch%sacha@free.net.ph--main%emacs-wiki--stable--${VERSION:0:3}--patch-${VERSION:4}" + SOURCE_URL=http://www.mwolson.org/static/dist/emacs-wiki/${SOURCE} + SOURCE2_URL=${SOURCE_URL}.sig + SOURCE_GPG=emacs-wiki.gpg:${SOURCE2}:UPSTREAM_KEY + SOURCE2_IGNORE=volatile WEB_SITE=http://members.iinet.net.au/~mtriggs/emacs-wiki.html - SOURCE_IGNORE=volatile ENTERED=20050716 UPDATED=20050716 BUILD_API=2 diff --git a/editors/emacs-wiki/HISTORY b/editors/emacs-wiki/HISTORY index 34c86c40b0..43b1890718 100644 --- a/editors/emacs-wiki/HISTORY +++ b/editors/emacs-wiki/HISTORY @@ -1,3 +1,7 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: bumped to 2.71 + * DEPENDS: remove tla dependency, changed emacs to EMACS dependency + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/editors/emacs-wiki/emacs-wiki.gpg b/editors/emacs-wiki/emacs-wiki.gpg Binary files differnew file mode 100644 index 0000000000..509abe3416 --- /dev/null +++ b/editors/emacs-wiki/emacs-wiki.gpg diff --git a/editors/fixme/DETAILS b/editors/fixme/DETAILS index 1ef98a3989..4a94ebdb75 100755 --- a/editors/fixme/DETAILS +++ b/editors/fixme/DETAILS @@ -1,10 +1,11 @@ SPELL=fixme - VERSION=2.2 + VERSION=3.2 SOURCE=$SPELL.zip SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL SOURCE_URL[0]=$CTAN_URL/macros/latex/contrib/$SOURCE SOURCE_URL[1]=http://theory.uwinnipeg.ca/scripts/CTAN/macros/latex/contrib/$SOURCE - SOURCE_HASH=sha512:3b1bbe0a6863f42724ae61f87e24bd13faba7839ac8b820967672abd890444b18f46f43733f6469a3e1902d2253dbd38099129fb10b3964d569969c67cc833fe + FORCE_DOWNLOAD=on + SOURCE_GPG=gurus.gpg:${SOURCE}.sig WEB_SITE=http://www.ctan.org/tex-archive/help/Catalogue/entries/fixme.html BUILD_API=2 ENTERED=20030511 diff --git a/editors/fixme/HISTORY b/editors/fixme/HISTORY index c4ad346cc6..1a80e0311e 100644 --- a/editors/fixme/HISTORY +++ b/editors/fixme/HISTORY @@ -1,3 +1,8 @@ +2006-06-26 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: updated to 3.2, added FORCE_DOWNLOAD because version is + missing from ${SOURCE} + * INSTALL: added ${INSTALL_ROOT} where applicable + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/editors/fixme/INSTALL b/editors/fixme/INSTALL index afff56b08b..74b5ccb0d3 100755 --- a/editors/fixme/INSTALL +++ b/editors/fixme/INSTALL @@ -1,9 +1,9 @@ mkdir -p $TEXMF/tex/latex/$SPELL && - mkdir -p /usr/doc/$SPELL && + mkdir -p ${INSTALL_ROOT}/usr/doc/$SPELL && cp $SPELL.sty $TEXMF/tex/latex/$SPELL && - cp *.dvi /usr/doc/$SPELL && - cp *.el /usr/doc/$SPELL && - cp README* /usr/doc/$SPELL && - cp NEWS* /usr/doc/$SPELL + cp *.dvi ${INSTALL_ROOT}/usr/doc/$SPELL && + cp *.el ${INSTALL_ROOT}/usr/doc/$SPELL && + cp README* ${INSTALL_ROOT}/usr/doc/$SPELL && + cp NEWS* ${INSTALL_ROOT}/usr/doc/$SPELL diff --git a/editors/fixme/fixme.zip.sig b/editors/fixme/fixme.zip.sig Binary files differnew file mode 100644 index 0000000000..a8624d5409 --- /dev/null +++ b/editors/fixme/fixme.zip.sig diff --git a/editors/gobby/DETAILS b/editors/gobby/DETAILS index af7fe97e59..f5cfcfe4ec 100755 --- a/editors/gobby/DETAILS +++ b/editors/gobby/DETAILS @@ -1,10 +1,13 @@ SPELL=gobby - VERSION=0.3.0 + VERSION=0.4.0rc2 BUILD_API=2 SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE2=${SOURCE}.sig SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:61f7026552d92202d7a4cb1875c54b9f60c52a56a3513581d628458f05d73f5c68937388e3784b7ea95a563000b84f1961d120b04b4d0c28cc43d7b122dcea61 + SOURCE2_URL=${SOURCE_URL}.sig + SOURCE_GPG=0x539.gpg:${SOURCE}.sig + SOURCE2_IGNORE=signature WEB_SITE=http://gobby.0x539.de/index.html ENTERED=20050930 UPDATED=20050930 diff --git a/editors/gobby/HISTORY b/editors/gobby/HISTORY index 4887c68f82..572dd168c2 100644 --- a/editors/gobby/HISTORY +++ b/editors/gobby/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: version 0.4.0rc2 + 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org> * DETAILS: version 0.3.0 diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS index c66978020a..ee9ae66b65 100755 --- a/editors/openoffice/DEPENDS +++ b/editors/openoffice/DEPENDS @@ -126,7 +126,7 @@ optional_depends openldap \ "" \ "Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one" && -optional_depends cups \ +optional_depends CUPS \ "--enable-cups" \ "" \ "enable cups support in the psprint project" && diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY index 22d5debf13..76908eadd9 100644 --- a/editors/openoffice/HISTORY +++ b/editors/openoffice/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/gnome2-apps/gqueue/DEPENDS b/gnome2-apps/gqueue/DEPENDS index 95d77e09c8..5f1afa9f38 100755 --- a/gnome2-apps/gqueue/DEPENDS +++ b/gnome2-apps/gqueue/DEPENDS @@ -1,2 +1,2 @@ depends libgnomeprintui && -depends cups +depends CUPS diff --git a/gnome2-apps/gqueue/HISTORY b/gnome2-apps/gqueue/HISTORY index 70056131b2..c1d9ba65a6 100644 --- a/gnome2-apps/gqueue/HISTORY +++ b/gnome2-apps/gqueue/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/gnome2-libs/libgnomecups/DEPENDS b/gnome2-libs/libgnomecups/DEPENDS index 78abda00d3..ed8498f097 100755 --- a/gnome2-libs/libgnomecups/DEPENDS +++ b/gnome2-libs/libgnomecups/DEPENDS @@ -1,4 +1,4 @@ depends glib && -depends cups && +depends CUPS && depends openssl diff --git a/gnome2-libs/libgnomecups/HISTORY b/gnome2-libs/libgnomecups/HISTORY index 28717899b0..db51b87bed 100644 --- a/gnome2-libs/libgnomecups/HISTORY +++ b/gnome2-libs/libgnomecups/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/gnustep-libs/gnustep-gui/DEPENDS b/gnustep-libs/gnustep-gui/DEPENDS index d94808337a..a42e859a1b 100755 --- a/gnustep-libs/gnustep-gui/DEPENDS +++ b/gnustep-libs/gnustep-gui/DEPENDS @@ -4,7 +4,7 @@ depends tiff && depends libpng && optional_depends libungif "" "" "Add gif support." && optional_depends aspell "" "" "Add spell checking support." && -optional_depends cups "" "" "Add printing support. " && +optional_depends CUPS "" "" "Add printing support. " && optional_depends audiofile "" "" "Add sound support." && optional_depends portaudio "" "" "Add portable audio support." && diff --git a/gnustep-libs/gnustep-gui/HISTORY b/gnustep-libs/gnustep-gui/HISTORY index e82c43f838..e48f599b0d 100644 --- a/gnustep-libs/gnustep-gui/HISTORY +++ b/gnustep-libs/gnustep-gui/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-04-14 Maurizio Boriani <baux@sourcemage.org> * Fix dummy concatenations stuff and others bugs. diff --git a/graphics/flphoto/DEPENDS b/graphics/flphoto/DEPENDS index e9d0b17616..c7814d7533 100755 --- a/graphics/flphoto/DEPENDS +++ b/graphics/flphoto/DEPENDS @@ -1,6 +1,6 @@ depends fltk && depends jpeg && optional_depends libgphoto2 "" "" "For Digital Cameras Support" && -optional_depends cups "" "" "For printing support" && +optional_depends CUPS "" "" "For printing support" && optional_depends libpng "" "" "For png format support" && optional_depends libungif "" "" "For gif format support" diff --git a/graphics/flphoto/HISTORY b/graphics/flphoto/HISTORY index 1b263ebd34..b1ddb6b799 100644 --- a/graphics/flphoto/HISTORY +++ b/graphics/flphoto/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/kde-core/kdelibs/DEPENDS b/kde-core/kdelibs/DEPENDS index 8d0fa48788..a1028d15fb 100755 --- a/kde-core/kdelibs/DEPENDS +++ b/kde-core/kdelibs/DEPENDS @@ -39,7 +39,7 @@ optional_depends alsa-lib \ '--without-alsa' \ 'for libKMid alsa support' && -optional_depends cups \ +optional_depends cups-old \ '--enable-cups' \ '--disable-cups' \ 'to use cups printing' && diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY index 9e18f13899..29cf620ec0 100644 --- a/kde-core/kdelibs/HISTORY +++ b/kde-core/kdelibs/HISTORY @@ -1,3 +1,9 @@ +2006-06-25 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * PRE_SUB_DEPENDS: added missing returns, #12747 + +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: changed cups to cups-old. kde doesn't work with 1.2.x + 2006-06-14 Treeve Jelbert <treeve01@pi.be> * DEPENDS: add prel, pcre, sane-backends, libntlm see bug #12652 diff --git a/kde-core/kdelibs/PRE_SUB_DEPENDS b/kde-core/kdelibs/PRE_SUB_DEPENDS index 8bc11f4c1c..9839dc81f4 100755 --- a/kde-core/kdelibs/PRE_SUB_DEPENDS +++ b/kde-core/kdelibs/PRE_SUB_DEPENDS @@ -1,6 +1,6 @@ case $THIS_SUB_DEPENDS in - SVG) is_depends_enabled $SPELL libart_lgpl;; - SSL) is_depends_enabled $SPELL openssl;; - ARTS) is_depends_enabled $SPELL arts;; + SVG) is_depends_enabled $SPELL libart_lgpl && return 0;; + SSL) is_depends_enabled $SPELL openssl && return 0;; + ARTS) is_depends_enabled $SPELL arts && return 0;; esac return 1 diff --git a/libs/obby/DETAILS b/libs/obby/DETAILS index 6fd40abf18..ac018d9ff3 100755 --- a/libs/obby/DETAILS +++ b/libs/obby/DETAILS @@ -1,10 +1,13 @@ SPELL=obby - VERSION=0.3.0 + VERSION=0.4.0rc2 BUILD_API=2 SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE2=${SOURCE}.sig SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:5d2545a6331763cde1a6e5e90c2c0491c2d8f14b29784e8bc2a750d5b46eadf2d5b21f212bd17d5c7af53b362808bdf103fae4788c6033af40668ff774cb028d + SOURCE2_URL=${SOURCE_URL}.sig + SOURCE_GPG=0x539.gpg:${SOURCE}.sig + SOURCE2_IGNORE=signature WEB_SITE=http://gobby.0x539.de/index.html ENTERED=20050930 UPDATED=20050930 diff --git a/libs/obby/HISTORY b/libs/obby/HISTORY index 12b7af3fa9..c494500568 100644 --- a/libs/obby/HISTORY +++ b/libs/obby/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: updated to 0.4.0rc2 + 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org> * DETAILS: updated to 0.3.0 * DEPENDS: fixed sub_depends line for gmp diff --git a/net/net6/DETAILS b/net/net6/DETAILS index 29c9e5b474..74cb5a9374 100755 --- a/net/net6/DETAILS +++ b/net/net6/DETAILS @@ -1,10 +1,13 @@ SPELL=net6 - VERSION=1.2.2 + VERSION=1.3.0rc2 BUILD_API=2 SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE2=${SOURCE}.sig SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE} - SOURCE_HASH=sha512:66f193b74b92b40c499a925082d3f5105a065bf24598da9859c5781c68ee8b868e816b005b0f8395df34a14589b1d0d7eeb78a49c9ef4458651491623fb373a0 + SOURCE2_URL=${SOURCE_URL}.sig + SOURCE_GPG=0x539.gpg:${SOURCE}.sig:UPSTREAM_KEY + SOURCE2_IGNORE=signature WEB_SITE=http://gobby.0x539.de/index.html ENTERED=20050930 UPDATED=20050930 diff --git a/net/net6/HISTORY b/net/net6/HISTORY index f268859451..ffa633b364 100644 --- a/net/net6/HISTORY +++ b/net/net6/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: updated to 1.3.0rc2 + 2006-03-26 Pieter Lenaerts <e-type@sourcemage.org> * DETAILS: updated to 1.2.2 diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS index 06941c3a7a..b885c73006 100755 --- a/net/samba/DEPENDS +++ b/net/samba/DEPENDS @@ -25,7 +25,7 @@ optional_depends linux-pam \ # "--without-ssl" \ # "for encrypted communication" && -optional_depends cups \ +optional_depends CUPS \ "--enable-cups" \ "--disable-cups" \ "for Samba support in CUPS" && diff --git a/net/samba/HISTORY b/net/samba/HISTORY index 6db9919598..ccf75629be 100644 --- a/net/samba/HISTORY +++ b/net/samba/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-09 Unet <unet@sourcemage.org> * CONFIGURE, BUILD, DETAILS, INSTALL, PRE_BUILD: Added support for samba-vscan diff --git a/net/sobby/DEPENDS b/net/sobby/DEPENDS new file mode 100755 index 0000000000..e772e73fa4 --- /dev/null +++ b/net/sobby/DEPENDS @@ -0,0 +1 @@ +depends obby diff --git a/net/sobby/DETAILS b/net/sobby/DETAILS new file mode 100755 index 0000000000..c1cdd937d1 --- /dev/null +++ b/net/sobby/DETAILS @@ -0,0 +1,18 @@ + SPELL=sobby + VERSION=0.4.0rc1 + BUILD_API=2 + SOURCE=${SPELL}-${VERSION}.tar.gz + SOURCE2=${SOURCE}.sig +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} + SOURCE_URL=http://releases.0x539.de/${SPELL}/${SOURCE} + SOURCE2_URL=${SOURCE_URL}.sig + SOURCE_GPG=0x539.gpg:${SOURCE}.sig + SOURCE2_IGNORE=signature + WEB_SITE=http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/WikiStart + ENTERED=20060625 + UPDATED=20060625 + LICENSE[0]=GPL + SHORT="standalone obby server" +cat << EOF +sobby is a standalone obby server. +EOF diff --git a/net/sobby/HISTORY b/net/sobby/HISTORY new file mode 100644 index 0000000000..9f4a0d64ae --- /dev/null +++ b/net/sobby/HISTORY @@ -0,0 +1,2 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS, DEPENDS, HISTORY: created spell diff --git a/printer/cups-drivers/DEPENDS b/printer/cups-drivers/DEPENDS index a3a350aa19..f195df054e 100755 --- a/printer/cups-drivers/DEPENDS +++ b/printer/cups-drivers/DEPENDS @@ -1 +1 @@ -depends cups +depends CUPS diff --git a/printer/cups-drivers/HISTORY b/printer/cups-drivers/HISTORY index 8c4e415262..87d20b64eb 100644 --- a/printer/cups-drivers/HISTORY +++ b/printer/cups-drivers/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/cupsddk/DEPENDS b/printer/cupsddk/DEPENDS index a3a350aa19..f195df054e 100755 --- a/printer/cupsddk/DEPENDS +++ b/printer/cupsddk/DEPENDS @@ -1 +1 @@ -depends cups +depends CUPS diff --git a/printer/cupsddk/HISTORY b/printer/cupsddk/HISTORY index ab4950f844..2eaf90cafe 100644 --- a/printer/cupsddk/HISTORY +++ b/printer/cupsddk/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/espgs/DEPENDS b/printer/espgs/DEPENDS index 9e5396fc57..92c2d75c04 100755 --- a/printer/espgs/DEPENDS +++ b/printer/espgs/DEPENDS @@ -11,7 +11,7 @@ if [ "${ESPGS_LIBGS}" == "y" ]; then depends gtk+ fi && -optional_depends "cups" \ +optional_depends "CUPS" \ "--enable-cups" \ "--disable-cups" \ "CUPS print spooler support" && diff --git a/printer/espgs/HISTORY b/printer/espgs/HISTORY index fa5b769ab4..18002b6769 100644 --- a/printer/espgs/HISTORY +++ b/printer/espgs/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-24 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * PRE_BUILD, ghostscript-8.15-sharedlib.patch: removed, included in 8.15.2 diff --git a/printer/foomatic/CONFIGURE b/printer/foomatic/CONFIGURE index 4b35bc2a4d..24c2e0fc91 100755 --- a/printer/foomatic/CONFIGURE +++ b/printer/foomatic/CONFIGURE @@ -7,6 +7,8 @@ if [ "${FOOMATIC_ENABLE_CONVERTER}" == "--enable-file-converter-check" ]; ## Sorted in order of most to least installed per http://ledger.sourcemage.org/ if spell_ok cups; then FOOMATIC_FILE_CONVERTER=cups + elif spell_ok cups-old; then + FOOMATIC_FILE_CONVERTER=cups-old elif spell_ok a2ps; then FOOMATIC_FILE_CONVERTER=a2ps elif spell_ok enscript; then @@ -16,6 +18,6 @@ if [ "${FOOMATIC_ENABLE_CONVERTER}" == "--enable-file-converter-check" ]; else config_query_list FOOMATIC_FILE_CONVERTER \ "Which file converter would you like to install?" \ - cups a2ps enscript mpage + cups cups-old a2ps enscript mpage fi fi diff --git a/printer/foomatic/HISTORY b/printer/foomatic/HISTORY index 44d5015241..068303e3fb 100644 --- a/printer/foomatic/HISTORY +++ b/printer/foomatic/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * CONFIGURE: Added case for cups-old + 2006-04-22 Jason Flatt <jflatt@sourcemage.org> * CONFIGURE, DEPENDS: Added check for optional file converter (bug # 11205). diff --git a/printer/gimp-print/DEPENDS b/printer/gimp-print/DEPENDS index 37330cbd6e..47b589d474 100755 --- a/printer/gimp-print/DEPENDS +++ b/printer/gimp-print/DEPENDS @@ -1 +1 @@ -optional_depends "cups" "--with-cups" "" "for cups support" +optional_depends "CUPS" "--with-cups" "" "for cups support" diff --git a/printer/gimp-print/HISTORY b/printer/gimp-print/HISTORY index 3fc41a7f87..8ebdfaa0fa 100644 --- a/printer/gimp-print/HISTORY +++ b/printer/gimp-print/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/gnulpr/CONFLICTS b/printer/gnulpr/CONFLICTS index 634c9aedd1..abb3d8b027 100755 --- a/printer/gnulpr/CONFLICTS +++ b/printer/gnulpr/CONFLICTS @@ -1 +1,2 @@ -conflicts cups +conflicts cups && +conflicts cups-old diff --git a/printer/gnulpr/HISTORY b/printer/gnulpr/HISTORY index 5176810321..cfc5c2bbaf 100644 --- a/printer/gnulpr/HISTORY +++ b/printer/gnulpr/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * CONFLICTS: Added conflicts cups-old + 2006-06-16 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * PRE_BUILD: removed * CONFLICTS: readded diff --git a/printer/gtklp/DEPENDS b/printer/gtklp/DEPENDS index 7d74abaf20..bc740a7795 100755 --- a/printer/gtklp/DEPENDS +++ b/printer/gtklp/DEPENDS @@ -1,2 +1,2 @@ depends gtk+2 && -depends cups +depends CUPS diff --git a/printer/gtklp/HISTORY b/printer/gtklp/HISTORY index 1197528a42..fb7b4207ad 100644 --- a/printer/gtklp/HISTORY +++ b/printer/gtklp/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/gutenprint/DEPENDS b/printer/gutenprint/DEPENDS index 2bf3ac2960..5d82028231 100755 --- a/printer/gutenprint/DEPENDS +++ b/printer/gutenprint/DEPENDS @@ -1,4 +1,4 @@ optional_depends gtk+ "--enable-libgutenprintui" "--disable-libgutenprintui" "ui plugin" && optional_depends gtk+2 "--enable-libgutenprintui2" "--disable-libgutenprintui2" "ui plugin" && optional_depends gimp "--with-gimp2 " "--without-gimp2 " "print plugin for GIMP" && -optional_depends "cups" "--with-cups" "" "for cups support" +optional_depends "CUPS" "--with-cups" "" "for cups support" diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY index 550f679d1a..36367f8500 100644 --- a/printer/gutenprint/HISTORY +++ b/printer/gutenprint/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-05-19 Treeve Jelbert <treeve01@pi.be> * DETAILS: version 5.0.0-rc3 diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS index 71124fde0d..f2fa8ba868 100755 --- a/printer/hplip/DEPENDS +++ b/printer/hplip/DEPENDS @@ -1,4 +1,4 @@ -depends cups && +depends CUPS && depends pyqt && depends net-snmp && depends foomatic && diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY index b9cf3662a6..3b897ff1c3 100644 --- a/printer/hplip/HISTORY +++ b/printer/hplip/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-05-22 Treeve Jelbert <treeve01@pi.be> * DETAILS: version 0.9.11 new website and url diff --git a/printer/hpoj/HISTORY b/printer/hpoj/HISTORY index 0a7c6cd866..75806fa7d7 100644 --- a/printer/hpoj/HISTORY +++ b/printer/hpoj/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * TRIGGERS: Added check for cups-old + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/hpoj/TRIGGERS b/printer/hpoj/TRIGGERS index 7260dfefc0..3b9cf6c90d 100755 --- a/printer/hpoj/TRIGGERS +++ b/printer/hpoj/TRIGGERS @@ -4,4 +4,7 @@ if spell_ok cups; then on_cast cups cast_self +fi && +if spell_ok cups-old; then + on_cast cups-old cast_self fi diff --git a/printer/pt/DEPENDS b/printer/pt/DEPENDS index 0583cb67f5..0913c40f4d 100755 --- a/printer/pt/DEPENDS +++ b/printer/pt/DEPENDS @@ -1,4 +1,4 @@ -depends cups && +depends CUPS && depends gtk+ && optional_depends "openssl" \ diff --git a/printer/pt/HISTORY b/printer/pt/HISTORY index 983263eb24..99969e1fca 100644 --- a/printer/pt/HISTORY +++ b/printer/pt/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/printer/xpp/DEPENDS b/printer/xpp/DEPENDS index fb750e8e3e..0909793a6a 100755 --- a/printer/xpp/DEPENDS +++ b/printer/xpp/DEPENDS @@ -1,2 +1,2 @@ -depends cups && +depends CUPS && depends fltk diff --git a/printer/xpp/HISTORY b/printer/xpp/HISTORY index a16cf14e5e..3192b22498 100644 --- a/printer/xpp/HISTORY +++ b/printer/xpp/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/utils/bluez-utils/DEPENDS b/utils/bluez-utils/DEPENDS index 5f83f9779c..0c1ad0bcb3 100755 --- a/utils/bluez-utils/DEPENDS +++ b/utils/bluez-utils/DEPENDS @@ -5,7 +5,7 @@ depends automake && optional_depends dbus "--enable-dbus" "--disable-dbus" "for dbus support" && optional_depends alsa-lib "--enable-alsa" "--disable-alsa" "for ALSA support" && -optional_depends cups "--enable-cups" "--disable-cups" "for CUPS support" && +optional_depends CUPS "--enable-cups" "--disable-cups" "for CUPS support" && optional_depends PCMCIA_TOOLS "--enable-pcmcia" "--disable-pcmcia" "for PCMCIA support" && optional_depends openobex "--enable-obex" "--disable-obex" "for openobex support" && optional_depends fuse "--enable-fuse" "--disable-fuse" "for FUSE support" && diff --git a/utils/bluez-utils/HISTORY b/utils/bluez-utils/HISTORY index f5461c5e39..7a6a4d8a79 100644 --- a/utils/bluez-utils/HISTORY +++ b/utils/bluez-utils/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-04-27 Jose Bernardo Silva <jbernardo@sourcemage.org> * DEPENDS: added hid2hic build if libusb is used; replaced pcmcia-cs with PCMCIA_TOOLS; added FUSE support diff --git a/wm-addons/devilspie/DETAILS b/wm-addons/devilspie/DETAILS index 7044a0ea5f..ee2444d17b 100755 --- a/wm-addons/devilspie/DETAILS +++ b/wm-addons/devilspie/DETAILS @@ -1,12 +1,12 @@ SPELL=devilspie - VERSION=0.16 + VERSION=0.17.1 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} SOURCE_URL[0]=http://www.burtonini.com/computing/${SOURCE} WEB_SITE=http://www.burtonini.com/blog/computers/devilspie ENTERED=20040618 UPDATED=20040618 - SOURCE_HASH=sha512:ee766a663ba5de72d31034527c8ebf3fef3d635c61b0b8a9b4953cd76828ddd6e4cda28d1be5248812bc97c5732f2dc47c1ebbab53007adbc87da07ce8268dbc + SOURCE_GPG=gurus.gpg:${SOURCE}.sig BUILD_API=2 LICENSE[0]=GPL SHORT="A window matching utility" diff --git a/wm-addons/devilspie/HISTORY b/wm-addons/devilspie/HISTORY index 100dc2745b..eb670937d9 100644 --- a/wm-addons/devilspie/HISTORY +++ b/wm-addons/devilspie/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 Pieter Lenaerts <e-type@sourcemage.org> + * DETAILS: updated to 0.17.1 + 2005-05-29 Pieter Lenaerts <e-type@sourcemage.org> * DETAILS: updated to 0.16 * CONFIGURE, INSTALL: removed, new config specs, no examples in src diff --git a/wm-addons/devilspie/devilspie-0.17.1.tar.gz.sig b/wm-addons/devilspie/devilspie-0.17.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..ce794b4cbc --- /dev/null +++ b/wm-addons/devilspie/devilspie-0.17.1.tar.gz.sig diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS index b829b41f77..ff539ef5ae 100755 --- a/x11-libs/wine/DEPENDS +++ b/x11-libs/wine/DEPENDS @@ -23,7 +23,7 @@ optional_depends ncurses \ "--without-curses" \ "curses gui?" && -optional_depends cups \ +optional_depends CUPS \ "" \ "" \ "printing support" && diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY index 4f1d77b04d..6151943b98 100644 --- a/x11-libs/wine/HISTORY +++ b/x11-libs/wine/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-21 Pol Vinogradov <vin.public@gmail.com> * DETAILS: Updated to 0.9.16, removed BUILD_API=2 line diff --git a/x11-toolkits/fox/DEPENDS b/x11-toolkits/fox/DEPENDS index cc78e5d9da..42ee7767c3 100755 --- a/x11-toolkits/fox/DEPENDS +++ b/x11-toolkits/fox/DEPENDS @@ -7,5 +7,5 @@ depends libpng && depends zlib && optional_depends "X11-LIBS" "--with-opengl=opengl" "--disable-opengl" "for gui support" && -optional_depends "cups" "" "" "for printing support" +optional_depends "CUPS" "" "" "for printing support" diff --git a/x11-toolkits/fox/HISTORY b/x11-toolkits/fox/HISTORY index 02669887bb..987997ee04 100644 --- a/x11-toolkits/fox/HISTORY +++ b/x11-toolkits/fox/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-18 Treeve Jelbert <treeve01@pi.be> * DETAILS: version 1.6.6 / 1.4.34 * PREPARE: change query, now defaults to 1.6.x diff --git a/x11-toolkits/qt-embedded/DEPENDS b/x11-toolkits/qt-embedded/DEPENDS index 36e1a5a7e3..4a291a3d77 100755 --- a/x11-toolkits/qt-embedded/DEPENDS +++ b/x11-toolkits/qt-embedded/DEPENDS @@ -58,7 +58,7 @@ optional_depends unixodbc \ "" \ "for ODBC database support" && -optional_depends cups \ +optional_depends CUPS \ "-cups" \ "-nocups" \ "for Common Unix Printing System support" && diff --git a/x11-toolkits/qt-embedded/HISTORY b/x11-toolkits/qt-embedded/HISTORY index a180b12ac3..6c8478a75f 100644 --- a/x11-toolkits/qt-embedded/HISTORY +++ b/x11-toolkits/qt-embedded/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> * DETAILS: (automated) Add KEYWORDS diff --git a/x11-toolkits/qt-x11/DEPENDS b/x11-toolkits/qt-x11/DEPENDS index 8c7f0b6e7e..9e1712aec7 100755 --- a/x11-toolkits/qt-x11/DEPENDS +++ b/x11-toolkits/qt-x11/DEPENDS @@ -54,7 +54,7 @@ optional_depends unixodbc \ "" \ "for ODBC database support" && -optional_depends cups \ +optional_depends CUPS \ "-cups" \ "-no-cups" \ "for Common Unix Printing System support" && diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY index 3d5ee9660a..68275dfa3f 100644 --- a/x11-toolkits/qt-x11/HISTORY +++ b/x11-toolkits/qt-x11/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-04 Daniel Goller <morfic@sourcemage.org> * DEPENDS: remove -stl/-no-stl flags from optional stlport depend to avoid turning off STL support * BUILD: add -stl to configure to ensure building with STL support, diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS index 4af1667526..a3953bbd37 100755 --- a/x11-toolkits/qt4/DEPENDS +++ b/x11-toolkits/qt4/DEPENDS @@ -63,7 +63,7 @@ optional_depends unixodbc \ '' \ 'for ODBC database support' && -optional_depends cups \ +optional_depends CUPS \ '-cups' \ '-no-cups' \ 'for Common Unix Printing System support' && diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index d8cd4bdd17..29db6c0984 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-06-04 Daniel Goller <morfic@sourcemage.org> * DEPENDS: remove -stl/-no-stl flags from optional stlport depend to avoid turning off STL support * BUILD: add -stl to configure to ensure building with STL support, diff --git a/xfce/xfprint/DEPENDS b/xfce/xfprint/DEPENDS index e1622dc7a5..b47cf3df9f 100755 --- a/xfce/xfprint/DEPENDS +++ b/xfce/xfprint/DEPENDS @@ -4,4 +4,4 @@ depends libxfce4util && depends libxfce4mcs && depends xfce-mcs-manager && depends a2ps && -optional_depends "cups" "--enable-cups" "--disable-cups" "to print to cups printers" +optional_depends "CUPS" "--enable-cups" "--disable-cups" "to print to cups printers" diff --git a/xfce/xfprint/HISTORY b/xfce/xfprint/HISTORY index bf137fc0db..f9495b7f5c 100644 --- a/xfce/xfprint/HISTORY +++ b/xfce/xfprint/HISTORY @@ -1,3 +1,6 @@ +2006-06-25 George Sherwood <george@beernabeer.com> + * DEPENDS: Changed to CUPS from cups + 2006-04-24 Arwed v. Merkatz <v.merkatz@gmx.net> * DEPENDS: added dependency on xfce-mcs-manager and libxfce4mcs (bug #11521), explicitly depend on gtk+2 and libxfce4util |