5 files changed, 35 insertions, 3 deletions

diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index c0c98aae33ce..9a5aaa0ae449 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -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 @@ NO_PACKAGE=	"Use and redistribution with repackaging are not allowed"
 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 @@ do-install:
 	@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 --git a/print/acroread7/files/pkg-install.in b/print/acroread7/files/pkg-install.in
new file mode 100644
index 000000000000..6d2c888c684c
--- /dev/null
+++ b/print/acroread7/files/pkg-install.in
@@ -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 --git a/print/acroread7/pkg-deinstall b/print/acroread7/pkg-deinstall
new file mode 100644
index 000000000000..0a6ab65f7d81
--- /dev/null
+++ b/print/acroread7/pkg-deinstall
@@ -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 --git a/print/acroread7/pkg-plist.7.0.1 b/print/acroread7/pkg-plist.7.0.1
index ef340661c31e..0b4367ab3946 100644
--- a/print/acroread7/pkg-plist.7.0.1
+++ b/print/acroread7/pkg-plist.7.0.1
@@ -633,3 +633,5 @@
 @dirrm %%ACRODIR%%/Browser/intellinux
 @dirrm %%ACRODIR%%/Browser
 @dirrm %%ACRODIR%%
+@dirrmtry Adobe/Acrobat7.0
+@dirrmtry Adobe
diff --git a/print/acroread7/pkg-plist.7.0.5 b/print/acroread7/pkg-plist.7.0.5
index fb0b3e4b844f..dfc7a2f475ac 100644
--- a/print/acroread7/pkg-plist.7.0.5
+++ b/print/acroread7/pkg-plist.7.0.5
@@ -575,3 +575,5 @@
 @dirrm %%ACRODIR%%/Browser/HowTo
 @dirrm %%ACRODIR%%/Browser
 @dirrm %%ACRODIR%%
+@dirrmtry Adobe/Acrobat7.0
+@dirrmtry Adobe