From 6be3497c840bd345aa19cf3e5417ba8af51ce12e Mon Sep 17 00:00:00 2001 From: dsomero Date: Thu, 16 Aug 2012 18:41:11 -0400 Subject: libraries/libproxy: Removed (part of Slackware 14.0) Signed-off-by: dsomero Signed-off-by: Robby Workman --- libraries/libproxy/README | 10 --- libraries/libproxy/gcc47-include-unistd.h.diff | 22 ------ libraries/libproxy/libproxy.SlackBuild | 103 ------------------------- libraries/libproxy/libproxy.info | 9 --- libraries/libproxy/only_link_mozjs185.diff | 46 ----------- libraries/libproxy/slack-desc | 19 ----- 6 files changed, 209 deletions(-) delete mode 100644 libraries/libproxy/README delete mode 100644 libraries/libproxy/gcc47-include-unistd.h.diff delete mode 100644 libraries/libproxy/libproxy.SlackBuild delete mode 100644 libraries/libproxy/libproxy.info delete mode 100644 libraries/libproxy/only_link_mozjs185.diff delete mode 100644 libraries/libproxy/slack-desc (limited to 'libraries') diff --git a/libraries/libproxy/README b/libraries/libproxy/README deleted file mode 100644 index 6fc94c753b..0000000000 --- a/libraries/libproxy/README +++ /dev/null @@ -1,10 +0,0 @@ -libproxy (proxy configuration library) - -libproxy exists to answer the question: Given a network resource, -how do I reach it? It handles all the details, enabling you to get -back to programming. GNOME? KDE? Command line? WPAD? PAC? Network -changed? It doesn't matter! Just ask libproxy what proxy to use: you -get simple code and your users get correct, consistant behavior and -broad infrastructure compatibility. - -This requires mozjs185 and nspr. diff --git a/libraries/libproxy/gcc47-include-unistd.h.diff b/libraries/libproxy/gcc47-include-unistd.h.diff deleted file mode 100644 index fc08aeeae7..0000000000 --- a/libraries/libproxy/gcc47-include-unistd.h.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp ---- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp 2011-06-06 16:44:37.220019451 -0500 -+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-04-15 23:35:45.752467960 -0500 -@@ -18,6 +18,7 @@ - ******************************************************************************/ - - #include -+#include - #include - #include - #include -diff -Nur libproxy-0.4.7.orig/libproxy/url.cpp libproxy-0.4.7/libproxy/url.cpp ---- libproxy-0.4.7.orig/libproxy/url.cpp 2011-06-06 16:44:37.216019447 -0500 -+++ libproxy-0.4.7/libproxy/url.cpp 2012-04-15 23:35:05.654783125 -0500 -@@ -27,6 +27,7 @@ - #define close _close - #endif - #include // For ::open() -+#include //For close(), read() - #include // For memcpy() - #include // For int/string conversion (using stringstream) - #include // For sscanf() diff --git a/libraries/libproxy/libproxy.SlackBuild b/libraries/libproxy/libproxy.SlackBuild deleted file mode 100644 index 5b431ddecf..0000000000 --- a/libraries/libproxy/libproxy.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for libproxy - -# Copyright 2009-2012 Robby Workman Northport, AL, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libproxy -VERSION=${VERSION:-0.4.7} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# 0.4.7 won't build against seamonkey's nss stuff, and the first commit in -# svn after that release disables its use in favor of nspr and js185 -patch -p0 < $CWD/only_link_mozjs185.diff - -# Include unistd.h for gcc-4.7.x -patch -p1 < $CWD/gcc47-include-unistd.h.diff - -cmake . \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ - -DMODULE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \ - -DPERL_VENDORINSTALL=yes - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libproxy/libproxy.info b/libraries/libproxy/libproxy.info deleted file mode 100644 index d8e6d8c4c3..0000000000 --- a/libraries/libproxy/libproxy.info +++ /dev/null @@ -1,9 +0,0 @@ -PRGNAM="libproxy" -VERSION="0.4.7" -HOMEPAGE="http://code.google.com/p/libproxy/" -DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.7.tar.gz" -MD5SUM="509e03a488a61cd62bfbaf3ab6a2a7a5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -MAINTAINER="Robby Workman" -EMAIL="rw@rlworkman.net" diff --git a/libraries/libproxy/only_link_mozjs185.diff b/libraries/libproxy/only_link_mozjs185.diff deleted file mode 100644 index 84016ac80b..0000000000 --- a/libraries/libproxy/only_link_mozjs185.diff +++ /dev/null @@ -1,46 +0,0 @@ -Index: libproxy/cmake/modules/pacrunner_mozjs.cmk -=================================================================== ---- libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 814) -+++ libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 815) -@@ -7,19 +7,15 @@ - include_directories("${MOZJS_INCLUDE_DIR}") - endif() - elseif(NOT APPLE) -- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") - option(WITH_MOZJS "Search for MOZJS package" ON) - if (WITH_MOZJS) -- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) -- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) -- if(MOZJS_FOUND) -- include_directories(${MOZJS_INCLUDE_DIRS}) -- link_directories(${MOZJS_LIBRARY_DIRS}) -- break() -- else() -- set(MOZJS_FOUND 0) -- endif() -- endforeach() -+ pkg_search_module(MOZJS mozjs185>=1.8.5) -+ if(MOZJS_FOUND) -+ include_directories(${MOZJS_INCLUDE_DIRS}) -+ link_directories(${MOZJS_LIBRARY_DIRS}) -+ else() -+ set(MOZJS_FOUND 0) -+ endif() - else() - set(MOZJS_FOUND 0) - endif() -Index: NEWS -=================================================================== ---- NEWS (revision 814) -+++ NEWS (revision 815) -@@ -1,3 +1,10 @@ -+New in version 0.4.8 (not yet released) -+============================== -+* Only support standalone mozjs185 as mozilla js engine. -+ xulrunner being part of the now lightning fast moving firefox -+ is impossible to be tracked as a dependency and it is not -+ supported by Mozilla to be used in this scenario. -+ - New in version 0.4.7 - ============================== - * Support/require xulrunner 2.0+ diff --git a/libraries/libproxy/slack-desc b/libraries/libproxy/slack-desc deleted file mode 100644 index c6520a6792..0000000000 --- a/libraries/libproxy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libproxy: libproxy (proxy configuration library) -libproxy: -libproxy: libproxy exists to answer the question: Given a network resource, -libproxy: how do I reach it? It handles all the details, enabling you to get -libproxy: back to programming. GNOME? KDE? Command line? WPAD? PAC? Network -libproxy: changed? It doesn't matter! Just ask libproxy what proxy to use: you -libproxy: get simple code and your users get correct, consistant behavior and -libproxy: broad infrastructure compatibility. -libproxy: -libproxy: Homepage: http://code.google.com/p/libproxy/ -libproxy: -- cgit v1.2.3