From owner-svn-ports-all@FreeBSD.ORG Thu May 8 23:41:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 546C9AF2; Thu, 8 May 2014 23:41:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4124E27B; Thu, 8 May 2014 23:41:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48NfWup003569; Thu, 8 May 2014 23:41:32 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48NfVrD003484; Thu, 8 May 2014 23:41:31 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405082341.s48NfVrD003484@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 8 May 2014 23:41:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353369 - in head: french/acroread9 german/acroread9 japanese/acroread9 print/acroread9 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2014 23:41:32 -0000 Author: bapt Date: Thu May 8 23:41:30 2014 New Revision: 353369 URL: http://svnweb.freebsd.org/changeset/ports/353369 QAT: https://qat.redports.org/buildarchive/r353369/ Log: Support stage Modified: head/french/acroread9/Makefile head/german/acroread9/Makefile head/japanese/acroread9/Makefile head/print/acroread9/Makefile head/print/acroread9/pkg-plist Modified: head/french/acroread9/Makefile ============================================================================== --- head/french/acroread9/Makefile Thu May 8 23:41:22 2014 (r353368) +++ head/french/acroread9/Makefile Thu May 8 23:41:30 2014 (r353369) @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= FRA -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/german/acroread9/Makefile ============================================================================== --- head/german/acroread9/Makefile Thu May 8 23:41:22 2014 (r353368) +++ head/german/acroread9/Makefile Thu May 8 23:41:30 2014 (r353369) @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= DEU -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/japanese/acroread9/Makefile ============================================================================== --- head/japanese/acroread9/Makefile Thu May 8 23:41:22 2014 (r353368) +++ head/japanese/acroread9/Makefile Thu May 8 23:41:30 2014 (r353369) @@ -10,5 +10,4 @@ DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= JPN -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/print/acroread9/Makefile ============================================================================== --- head/print/acroread9/Makefile Thu May 8 23:41:22 2014 (r353368) +++ head/print/acroread9/Makefile Thu May 8 23:41:30 2014 (r353369) @@ -20,9 +20,9 @@ LICENSE_PERMS= auto-accept RUN_DEPENDS= acroreadwrapper>=0.0.20110529:${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 -USE_BZIP2= yes USE_LINUX= yes USE_LINUX_APPS= cups-libs gdkpixbuf gtk2 libgcrypt libgpg-error libxml2 pango USE_LDCONFIG= yes @@ -49,7 +49,7 @@ LANGCODE= chs:zh_CN cht:zh_TW dan:da_DK ADOBE_LANG?= ENU .for L in ${ADOBE_LANG:tl} LOCALE_NAME= ${LANGCODE:M${L}\:*:C/.*\://} -MANLANG= ${LOCALE_NAME:C/_.*//:C/en/""/} +MANLANG= ${LOCALE_NAME:C/_.*//:C/en//} LANG_${L:tu}= "" LANG_NON${L:tu}= "@comment " .endfor @@ -68,31 +68,27 @@ INSTALLDIR= ${PREFIX}/${ACRODIR} INSTALLEXEC= ${SETENV} UNAME_s=Linux \ InstallDir=${INSTALLDIR} \ UNAME_r="Linux Compatibility on FreeBSD" \ - ${SH} ./INSTALL --install_path=${INSTALLDIR} > /dev/null - -MAN1= acroread.1 -MANCOMPRESSED= yes + ${SH} ./INSTALL --install_path=${STAGEDIR}${INSTALLDIR} > /dev/null +.if !empty(MANLANG) MANINSTALLDIR= man/${MANLANG} -NO_STAGE= yes -post-man-install: - ${MKDIR} ${MANPREFIX}/${MANINSTALLDIR}/man1 - ${LN} -s -f \ - ${INSTALLDIR}/Adobe/Reader9/Resource/Shell/acroread.1.gz \ - ${MANPREFIX}/${MANINSTALLDIR}/man1/ +.else +MANINSTALLDIR= man +.endif -pre-su-install: +pre-install: @${MKDIR} ${WRKDIR}/bin @${INSTALL_SCRIPT} \ ${WRKDIR}/ln ${WRKDIR}/rm ${WRKDIR}/mv \ ${WRKDIR}/bin do-install: - @${ECHO_CMD} Installing... - @${MKDIR} ${INSTALLDIR} - @${MKDIR} ${PREFIX}/share/desktop-directories + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null - -post-install: post-man-install - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${MANPREFIX}/${MANINSTALLDIR}/man1 + ${LN} -s -f \ + ${INSTALLDIR}/Adobe/Reader9/Resource/Shell/acroread.1.gz \ + ${STAGEDIR}${MANPREFIX}/${MANINSTALLDIR}/man1/ + ${SED} -i "" -e "s,${STAGEDIR},," ${STAGEDIR}${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/.config .include Modified: head/print/acroread9/pkg-plist ============================================================================== --- head/print/acroread9/pkg-plist Thu May 8 23:41:22 2014 (r353368) +++ head/print/acroread9/pkg-plist Thu May 8 23:41:30 2014 (r353369) @@ -433,6 +433,7 @@ %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win/CP950.TXT %%ACRODIR%%/Adobe/Reader9/bin/UNINSTALL %%ACRODIR%%/Adobe/Reader9/bin/acroread +%%MANINSTALLDIR%%/man1/acroread.1.gz @dirrm %%ACRODIR%%/Adobe/Reader9/bin @dirrm %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win @dirrm %%ACRODIR%%/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/mac