svn commit: r355109 - head/print/acroread8

[Hiroki Sato]

Author: hrs
Date: Sun May 25 04:09:13 2014
New Revision: 355109
URL: http://svnweb.freebsd.org/changeset/ports/355109
QAT: https://qat.redports.org/buildarchive/r355109/

Log:
  - Remove GlobalPrefs/.config.
  - Fix pkg-message.

Modified:
  head/print/acroread8/Makefile
  head/print/acroread8/pkg-plist

Modified: head/print/acroread8/Makefile
==============================================================================
--- head/print/acroread8/Makefile	Sun May 25 03:55:50 2014	(r355108)
+++ head/print/acroread8/Makefile	Sun May 25 04:09:13 2014	(r355109)
@@ -3,10 +3,10 @@
 
 PORTNAME=	acroread8
 PORTVERSION=	8.1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	print linux
 MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:tl}/ \
-		ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:tl}/
+		ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:L}/
 DISTNAME=	AdobeReader_${ADOBE_LANG:tl}-${PORTVERSION}-1.i486
 DIST_SUBDIR=	acroread
 
@@ -20,9 +20,9 @@ LICENSE_PERMS=	auto-accept
 
 RUN_DEPENDS=	acroreadwrapper>=0.0.20100806:${PORTSDIR}/print/acroreadwrapper
 
-USES=		tar:bzip2
 RESTRICTED=	Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html
 ONLY_FOR_ARCHS=	amd64 i386
+USES=		tar:bzip2
 USE_LINUX=	yes
 USE_LINUX_APPS=	cups-libs gtk2 pango libgcrypt libgpg-error
 USE_LDCONFIG=	yes
@@ -34,10 +34,9 @@ PLIST_SUB=	ACRODIR=${ACRODIR} \
 		PLUGINDIR=${PLUGINDIR} \
 		ADOBE_LANG=${ADOBE_LANG:tu} \
 		LOCALE_NAME=${LOCALE_NAME}
-SUB_FILES=	ln mv rm pkg-message pkg-deinstall
+SUB_FILES=	ln mv rm pkg-deinstall
 SUB_LIST=	ADOBE_LANG=${ADOBE_LANG:tu} \
 		ACROBASE=${ACROBASE}
-PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 WRKSRC=		${WRKDIR}/AdobeReader
 
@@ -46,10 +45,14 @@ LANGCODE=	chs:zh_CN cht:zh_TW dan:da_DK 
 		nld:nl_NL nor:nb_NO ptb:pt_BR suo:fi_FI sve:sv_SE
 
 ADOBE_LANG?=	ENU
+.if ${ADOBE_LANG:tu} != ENU
+SUB_FILES+=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+.endif
 .for L in ${ADOBE_LANG:tl}
 LOCALE_NAME=	${LANGCODE:M${L}\:*:C/.*\://}
 LANG_${L:tu}=	""
-LANG_NON${L:tu}=	"@comment "
+LANG_NON${L:tu}="@comment "
 .endfor
 .for L in ${LANGCODE:C/\:.*//:tu}
 LANG_${L}?=	"@comment "
@@ -64,19 +67,24 @@ ACRODIR=	${ACROBASE}/${ADOBE_LANG:tu}
 PLUGINDIR=	lib/browser_linux_plugins
 INSTALLDIR=	${PREFIX}/${ACRODIR}
 INSTALLEXEC=	${SETENV} UNAME_s=Linux \
-			InstallDir=${INSTALLDIR} \
-			UNAME_r="Linux Compatibility on FreeBSD" \
-			${SH} ./INSTALL --install_path=${STAGEDIR}${INSTALLDIR} > /dev/null
+		    InstallDir=${INSTALLDIR} \
+		    UNAME_r="Linux Compatibility on FreeBSD" \
+		    ${SH} ./INSTALL \
+		    --install_path=${STAGEDIR}${INSTALLDIR} > /dev/null
 
 pre-install:
 	@${MKDIR} ${WRKDIR}/bin
 	@${INSTALL_SCRIPT} \
-		${WRKDIR}/ln ${WRKDIR}/rm ${WRKDIR}/mv \
-		${WRKDIR}/bin
+	    ${WRKDIR}/ln ${WRKDIR}/rm ${WRKDIR}/mv \
+	    ${WRKDIR}/bin
 do-install:
+	@${ECHO_CMD} Installing...
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
-	@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null
-	${SED} -i "" -e "s,${STAGEDIR},," ${STAGEDIR}${INSTALLDIR}/Adobe/Reader8/Reader/GlobalPrefs/.config
+	@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} \
+	    ${INSTALLEXEC} > /dev/null
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/Adobe/Reader8/${ADOBE_LANG:tu}/Adobe/Reader8/Reader/GlobalPrefs/.config
 
 .include <bsd.port.mk>

Modified: head/print/acroread8/pkg-plist
==============================================================================
--- head/print/acroread8/pkg-plist	Sun May 25 03:55:50 2014	(r355108)
+++ head/print/acroread8/pkg-plist	Sun May 25 04:09:13 2014	(r355109)
@@ -845,7 +845,6 @@
 %%LANG_NONENU%%%%ACRODIR%%/Adobe/Reader8/Reader/BeyondReader/%%ADOBE_LANG%%/Onramp/tl-onramp.gif
 %%LANG_NONENU%%%%ACRODIR%%/Adobe/Reader8/Reader/BeyondReader/%%ADOBE_LANG%%/Onramp/tr-onramp.gif
 %%ACRODIR%%/Adobe/Reader8/Reader/Cert/curl-ca-bundle.crt
-%%ACRODIR%%/Adobe/Reader8/Reader/GlobalPrefs/.config
 %%ACRODIR%%/Adobe/Reader8/Reader/GlobalPrefs/reader_prefs
 %%ACRODIR%%/Adobe/Reader8/Reader/HowTo/ENU/Engineering.html
 %%ACRODIR%%/Adobe/Reader8/Reader/HowTo/ENU/Export.html