Date: Tue, 2 May 2006 07:46:49 +0200 (CEST) From: Jean-Yves Lefort <jylefort@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hrs@FreeBSD.org Subject: ports/96642: Update port: print/acroread7 (fix plist; install desktop entry) Message-ID: <20060502054649.76F22C101@jsite.lefort.net> Resent-Message-ID: <200605020550.k425oEg2030665@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96642
>Category: ports
>Synopsis: Update port: print/acroread7 (fix plist; install desktop entry)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue May 02 05:50:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Fri Apr 28 18:59:37 CEST 2006 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
Notes:
- slave ports handling: the desktop entry and icon are installed
when the first acroread port is installed, and deinstalled when the
last acroread port is deinstalled
- slave port revisions should be bumped as well
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/print/acroread7/Makefile acroread7/Makefile
--- /usr/ports/print/acroread7/Makefile Sat Mar 11 20:43:09 2006
+++ acroread7/Makefile Tue May 2 07:29:44 2006
@@ -7,7 +7,7 @@
PORTNAME= acroread7
PORTVERSION?= 7.0.1
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 1
CATEGORIES?= print linux
MASTER_SITES?= http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${VERSIONDIR}/${ADOBE_LANG:L}/ \
@@ -27,14 +27,15 @@
ONLY_FOR_ARCHS= amd64 i386
USE_LINUX= yes
USE_X_PREFIX= yes
+USE_GNOME= desktopfileutils
NO_BUILD= yes
PLIST= ${PKGDIR}/pkg-plist.${PORTVERSION}
PLIST_SUB= ACRODIR=${ACRODIR} \
PLUGINDIR=${PLUGINDIR} \
ADOBE_LANG=${ADOBE_LANG:U} \
LOCALE_NAME=${LOCALE_NAME}
-SUB_FILES= ln mv rm pkg-message
-SUB_LIST= ADOBE_LANG=${ADOBE_LANG:U}
+SUB_FILES= ln mv rm pkg-message pkg-install
+SUB_LIST= ADOBE_LANG=${ADOBE_LANG:U} ACRODIR=${ACRODIR}
PKGMESSAGE= ${WRKDIR}/pkg-message
WRKSRC= ${WRKDIR}/AdobeReader
@@ -83,6 +84,7 @@
@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC}
${CHMOD} 0 ${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api
${BRANDELF} -t Linux ${INSTALLDIR}/Reader/intellinux/bin/acroread
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${ADOBE_LANG:U} != ENU
post-install:
diff -ruN /usr/ports/print/acroread7/files/pkg-install.in acroread7/files/pkg-install.in
--- /usr/ports/print/acroread7/files/pkg-install.in Thu Jan 1 01:00:00 1970
+++ acroread7/files/pkg-install.in Tue May 2 07:37:03 2006
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+[ "$2" != "POST-INSTALL" ] && exit 0
+
+if [ ! -e $PKG_PREFIX/share/applications/AdobeReader.desktop ]; then
+ mkdir -p $PKG_PREFIX/share/applications
+ cp -p $PKG_PREFIX/%%ACRODIR%%/Resource/Support/AdobeReader_GNOME.desktop \
+ $PKG_PREFIX/share/applications/AdobeReader.desktop
+ cat >>$PKG_PREFIX/share/applications/AdobeReader.desktop <<EOF
+Comment=View PDF documents
+StartupNotify=true
+EOF
+ cp -p $PKG_PREFIX/%%ACRODIR%%/Resource/Icons/AdobeReader.png \
+ $PKG_PREFIX/share/pixmaps
+ update-desktop-database >/dev/null || true
+fi
diff -ruN /usr/ports/print/acroread7/pkg-deinstall acroread7/pkg-deinstall
--- /usr/ports/print/acroread7/pkg-deinstall Thu Jan 1 01:00:00 1970
+++ acroread7/pkg-deinstall Tue May 2 07:21:20 2006
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+[ "$2" != "POST-DEINSTALL" ] && exit 0
+
+if [ ! -e $PKG_PREFIX/Adobe/Acrobat7.0 ]; then
+ rm -f $PKG_PREFIX/share/applications/AdobeReader.desktop
+ rm -f $PKG_PREFIX/share/pixmaps/AdobeReader.png
+ rmdir $PKG_PREFIX/share/applications 2>/dev/null || true
+ update-desktop-database >/dev/null || true
+fi
diff -ruN /usr/ports/print/acroread7/pkg-plist.7.0.1 acroread7/pkg-plist.7.0.1
--- /usr/ports/print/acroread7/pkg-plist.7.0.1 Mon Apr 3 09:37:16 2006
+++ acroread7/pkg-plist.7.0.1 Tue May 2 07:26:42 2006
@@ -633,3 +633,5 @@
@dirrm %%ACRODIR%%/Browser/intellinux
@dirrm %%ACRODIR%%/Browser
@dirrm %%ACRODIR%%
+@dirrmtry Adobe/Acrobat7.0
+@dirrmtry Adobe
diff -ruN /usr/ports/print/acroread7/pkg-plist.7.0.5 acroread7/pkg-plist.7.0.5
--- /usr/ports/print/acroread7/pkg-plist.7.0.5 Tue Feb 21 19:49:08 2006
+++ acroread7/pkg-plist.7.0.5 Tue May 2 07:26:58 2006
@@ -575,3 +575,5 @@
@dirrm %%ACRODIR%%/Browser/HowTo
@dirrm %%ACRODIR%%/Browser
@dirrm %%ACRODIR%%
+@dirrmtry Adobe/Acrobat7.0
+@dirrmtry Adobe
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060502054649.76F22C101>