[PC-BSD Commits] r20078 - in pbi/modules/deskutils/calibre: . xdg-desktop xdg-menu

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-10-29 19:37:43 +0000 (Mon, 29 Oct 2012)
New Revision: 20078

Modified:
   pbi/modules/deskutils/calibre/external-links
   pbi/modules/deskutils/calibre/pbi.conf
   pbi/modules/deskutils/calibre/xdg-desktop/calibre.desktop
   pbi/modules/deskutils/calibre/xdg-menu/calibre.desktop
Log:
Redo the deskutils/calibre module. Thanks to donald Cooley for sending in the updated module



Modified: pbi/modules/deskutils/calibre/external-links
===================================================================
--- pbi/modules/deskutils/calibre/external-links	2012-10-29 19:32:36 UTC (rev 20077)
+++ pbi/modules/deskutils/calibre/external-links	2012-10-29 19:37:43 UTC (rev 20078)
@@ -3,9 +3,5 @@
 # Defaults to keeping any existing files in LOCALBASE
 # Use action binary for binaries that need wrapper functionality
 
-# TARGET                LINK IN LOCALBASE       ACTION
-#etc/rc.d/servfoo       etc/rc.d/servfoo        keep
-#include/libfoo.h       include/libfoo.h        replace
-#bin/appfoo             bin/appfoo              binary,nocrash
-#bin/appfoo2            bin/appfoo-test         binary
-
+# TARGET             LINK IN LOCALBASE         ACTION
+bin/calibre     bin/calibre     binary

Modified: pbi/modules/deskutils/calibre/pbi.conf
===================================================================
--- pbi/modules/deskutils/calibre/pbi.conf	2012-10-29 19:32:36 UTC (rev 20077)
+++ pbi/modules/deskutils/calibre/pbi.conf	2012-10-29 19:37:43 UTC (rev 20078)
@@ -1,28 +1,24 @@
 #!/bin/sh
 # PBI Build Configuration
-# Place over-rides and settings here
-#
-# XDG Desktop Menu Spec:
-# http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
-##############################################################################
 
-# Program Name
-PBI_PROGNAME="calibre"
- 
-# Program Website
-PBI_PROGWEB="http://calibre.kovidgoyal.net/"
- 
-# Program Author / Vendor
-PBI_PROGAUTHOR="stas at FreeBSD.org"
- 
-# Default Icon (Relative to %%PBI_APPDIR%% or resources/)
+# -- Program Information --
+PBI_PROGNAME="Calibre"
+PBI_PROGWEB="http://calibre-ebook.com"
+PBI_PROGAUTHOR="Kovid Goyal <kovid at kovidgoyal.net>"
 PBI_PROGICON="calibre.png"
- 
-# The target port we are building
+
+# -- Port Information --
 PBI_MAKEPORT="deskutils/calibre"
+PBI_MKPORTBEFORE=""
+PBI_MKPORTAFTER=" www/py-cssutils"
+PBI_MAKEOPTS=""
 
-PBI_MKPORTAFTER="www/py-cssutils"
+# -- Require Root Permissions to Install PBI --
+PBI_REQUIRESROOT="NO"
 
-PBI_BUILDKEY="02"
- 
-export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MKPORTAFTER PBI_BUILDKEY
+# -- Auto-build Configuration Options --
+PBI_BUILDKEY="00"
+PBI_AB_PRIORITY="00"
+PBI_AB_NOTMPFS="NO"
+
+export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_REQUIRESROOT PBI_BUILDKEY PBI_AB_PRIORITY PBI_AB_NOTMPFS

Modified: pbi/modules/deskutils/calibre/xdg-desktop/calibre.desktop
===================================================================
--- pbi/modules/deskutils/calibre/xdg-desktop/calibre.desktop	2012-10-29 19:32:36 UTC (rev 20077)
+++ pbi/modules/deskutils/calibre/xdg-desktop/calibre.desktop	2012-10-29 19:37:43 UTC (rev 20078)
@@ -1,8 +1,8 @@
-#!/usr/bin/env xdg-open
+#!/usr/bin/env
 [Desktop Entry]
 Value=1.0
 Type=Application
-Name=calibre
+Name=Calibre
 GenericName=calibre
 Exec=%%PBI_EXEDIR%%/calibre
 Path=%%PBI_APPDIR%%

Modified: pbi/modules/deskutils/calibre/xdg-menu/calibre.desktop
===================================================================
--- pbi/modules/deskutils/calibre/xdg-menu/calibre.desktop	2012-10-29 19:32:36 UTC (rev 20077)
+++ pbi/modules/deskutils/calibre/xdg-menu/calibre.desktop	2012-10-29 19:37:43 UTC (rev 20078)
@@ -1,8 +1,8 @@
-#!/usr/bin/env xdg-open
+#!/usr/bin/env
 [Desktop Entry]
 Value=1.0
 Type=Application
-Name=calibre
+Name=Calibre
 GenericName=calibre
 Exec=%%PBI_EXEDIR%%/calibre
 Path=%%PBI_APPDIR%%