merged duply and duplicity

cross/bash/Makefile

@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://ftp.gnu.org/gnu/bash
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS =
+DEPENDS = cross/ncurses
 
 HOMEPAGE = http://www.gnu.org/software/bash/
 COMMENT  = Bash is the GNU Project's shell. Bash is the Bourne Again SHell. Bash is an sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh).

cross/duply/PLIST

@@ -1,2 +1 @@
-share/duply/CHANGELOG.txt
-share/duply/duply
+share/duply/duply

cross/duply/patches/bash_path.patch

@@ -3,7 +3,7 @@ diff -rupN duply_1.11_orig/duply duply_1.11/duply
 +++ duply	2015-11-27 17:45:31.749313264 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
-+#!/usr/local/duply/bin/bash
++#!/usr/local/duplicity/bin/bash
  #
  ###############################################################################
  #  duply (grown out of ftplicity), is a shell front end to duplicity that     #

spk/duplicity/src/installer.sh

@@ -29,6 +29,7 @@ postinst ()
     # Add symlink
     mkdir -p /usr/local/bin
     ln -s ${INSTALL_DIR}/env/bin/duplicity /usr/local/bin/duplicity
+    ln -s ${INSTALL_DIR}/share/duply/duply /usr/local/bin/duply
 
     # Correct the files ownership
     chown -R ${USER}:root ${SYNOPKG_PKGDEST}
@@ -46,6 +47,7 @@ postuninst ()
     # Remove link
     rm -f ${INSTALL_DIR}
     rm -f /usr/local/bin/duplicity
+    rm -f /usr/local/bin/duply
     exit 0
 }
 

spk/duply/Makefile

@@ -1,26 +0,0 @@
-SPK_NAME = duply
-SPK_VERS = 1.11
-SPK_REV = 1
-
-SPK_ICON = src/duply.png
-
-DEPENDS = cross/bash cross/$(SPK_NAME)
-SPK_DEPENDS = duplicity
-
-DESCRIPTION = duply is a frontend for the mighty duplicity magic. duplicity is a python based shell application that makes encrypted incremental backups to remote storages. Different backends like ftp, sftp, imap, s3 and others are supported. See duplicity manpage for a complete list of backends and features.
-
-STARTABLE = no
-DISPLAY_NAME = duply
-CHANGELOG = "Initial release"
-BETA = 1
-
-HOMEPAGE = http://duply.net/
-LICENSE  = GNU General Public License
-
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
-
-include ../../mk/spksrc.spk.mk
-

spk/duply/src/dsm-control.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Package
-PACKAGE="duply"
-DNAME="duply"
-
-# Others
-INSTALL_DIR="/usr/local/${PACKAGE}"
-
-
-case $1 in
-    start)
-        exit 0
-        ;;
-    stop)
-        exit 0
-        ;;
-    status)
-        exit 0
-        ;;
-    log)
-        exit 1
-        ;;
-    *)
-        exit 1
-        ;;
-esac

spk/duply/src/installer.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Package
-PACKAGE="duply"
-DNAME="duply"
-
-# Others
-INSTALL_DIR="/usr/local/${PACKAGE}"
-
-preinst ()
-{
-    exit 0
-}
-
-postinst ()
-{
-    # Link
-    ln -s ${SYNOPKG_PKGDEST} ${INSTALL_DIR}
-
-    # Add symlink
-    mkdir -p /usr/local/bin
-    ln -s ${INSTALL_DIR}/share/duply/duply /usr/local/bin/duply
-
-    exit 0
-}
-
-preuninst ()
-{
-    exit 0
-}
-
-postuninst ()
-{
-    # Remove link
-    rm -f ${INSTALL_DIR}
-    rm -f /usr/local/bin/duply
-    
-    exit 0
-}
-
-preupgrade ()
-{
-    exit 0
-}
-
-postupgrade ()
-{
-    exit 0
-}