diff options
-rw-r--r-- | french/acroread9/distinfo | 4 | ||||
-rw-r--r-- | german/acroread9/distinfo | 4 | ||||
-rw-r--r-- | japanese/acroread9/distinfo | 4 | ||||
-rw-r--r-- | print/acroread9/Makefile | 14 | ||||
-rw-r--r-- | print/acroread9/distinfo | 4 | ||||
-rw-r--r-- | print/acroread9/files/pkg-message.in | 19 | ||||
-rw-r--r-- | print/acroreadwrapper/Makefile | 31 | ||||
-rw-r--r-- | print/acroreadwrapper/distinfo | 2 | ||||
-rw-r--r-- | print/acroreadwrapper/files/acroread.in | 1 | ||||
-rw-r--r-- | print/acroreadwrapper/files/linux_adobe.sh.in | 26 |
10 files changed, 68 insertions, 41 deletions
diff --git a/french/acroread9/distinfo b/french/acroread9/distinfo index 836801dbe722..87c14f2ae4d7 100644 --- a/french/acroread9/distinfo +++ b/french/acroread9/distinfo @@ -1,2 +1,2 @@ -SHA256 (acroread/AdbeRdr9.4.1-1_i486linux_fra.tar.bz2) = cdb7f12634d567548212294bebaf26d3979f9500f786fa1af31feefc57f30ec3 -SIZE (acroread/AdbeRdr9.4.1-1_i486linux_fra.tar.bz2) = 64517992 +SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_fra.tar.bz2) = b5d017859057ea1ff2ea6c238a33cb7f5f4ab404c06b0a91d9c9ae41baa1e051 +SIZE (acroread/AdbeRdr9.4.2-1_i486linux_fra.tar.bz2) = 64485671 diff --git a/german/acroread9/distinfo b/german/acroread9/distinfo index 18b0269352fa..53ab14f98ea0 100644 --- a/german/acroread9/distinfo +++ b/german/acroread9/distinfo @@ -1,2 +1,2 @@ -SHA256 (acroread/AdbeRdr9.4.1-1_i486linux_deu.tar.bz2) = 2bceb6c191cde69980d97d63555243c00e2c04cb6111cccd589c397ec7951840 -SIZE (acroread/AdbeRdr9.4.1-1_i486linux_deu.tar.bz2) = 65881866 +SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_deu.tar.bz2) = 4e19e8794e0830a16e6dab41a91fc5efc1bbca4528d4107843e81ba354993949 +SIZE (acroread/AdbeRdr9.4.2-1_i486linux_deu.tar.bz2) = 65981114 diff --git a/japanese/acroread9/distinfo b/japanese/acroread9/distinfo index 359fae5a0b25..64c3044eb3ea 100644 --- a/japanese/acroread9/distinfo +++ b/japanese/acroread9/distinfo @@ -1,2 +1,2 @@ -SHA256 (acroread/AdbeRdr9.4.1-1_i486linux_jpn.tar.bz2) = 65d7364dc90c7e17e5fbce33473266b6a9059cbffe6ce0bb349c930716f2d365 -SIZE (acroread/AdbeRdr9.4.1-1_i486linux_jpn.tar.bz2) = 68340925 +SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_jpn.tar.bz2) = 228bc45f59c587b9bea0652aa36b0add10a340ba022347ee9205931214d017ba +SIZE (acroread/AdbeRdr9.4.2-1_i486linux_jpn.tar.bz2) = 68341985 diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile index 30e185fda302..62ef65a00690 100644 --- a/print/acroread9/Makefile +++ b/print/acroread9/Makefile @@ -6,8 +6,7 @@ # PORTNAME= acroread9 -PORTVERSION= 9.4.1 -PORTREVISION?= 1 +PORTVERSION= 9.4.2 CATEGORIES?= print linux MASTER_SITES?= http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/ \ ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/ @@ -17,7 +16,7 @@ DIST_SUBDIR= acroread MAINTAINER= hrs@FreeBSD.org COMMENT= Adobe Reader for view, print, and search PDF documents (${ADOBE_LANG}) -RUN_DEPENDS= acroreadwrapper>=0.0.20100806:${PORTSDIR}/print/acroreadwrapper +RUN_DEPENDS= acroreadwrapper>=0.0.20110529:${PORTSDIR}/print/acroreadwrapper RESTRICTED= Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html ONLY_FOR_ARCHS= amd64 i386 @@ -67,13 +66,6 @@ INSTALLEXEC= ${SETENV} UNAME_s=Linux \ UNAME_r="Linux Compatibility on FreeBSD" \ ${SH} ./INSTALL --install_path=${INSTALLDIR} > /dev/null -pre-everything:: - @${ECHO_CMD} "=======================================================" - @${ECHO_CMD} "Try print/acroread8 instead if you need Adobe Reader." - @${ECHO_CMD} "Currently acroread9 port does not work with X Window " - @${ECHO_CMD} "System because of issues in FreeBSD's Linux emulation." - @${ECHO_CMD} "=======================================================" - pre-install: @${MKDIR} ${WRKDIR}/bin @${INSTALL_SCRIPT} \ @@ -86,9 +78,7 @@ do-install: @${MKDIR} ${PREFIX}/share/desktop-directories @cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null -.if ${ADOBE_LANG:U} != ENU post-install: @${CAT} ${PKGMESSAGE} -.endif .include <bsd.port.mk> diff --git a/print/acroread9/distinfo b/print/acroread9/distinfo index 46b5b9325e2e..6ec13cb7d167 100644 --- a/print/acroread9/distinfo +++ b/print/acroread9/distinfo @@ -1,2 +1,2 @@ -SHA256 (acroread/AdbeRdr9.4.1-1_i486linux_enu.tar.bz2) = 6bf9bf427462a7a9ba7e7115cffe659bccb70758428ab32571e6ed78333b0b95 -SIZE (acroread/AdbeRdr9.4.1-1_i486linux_enu.tar.bz2) = 60172257 +SHA256 (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 10ec272ae12a52a06ae88e1e7737423742160f172f789a22ed906a7af2b3a876 +SIZE (acroread/AdbeRdr9.4.2-1_i486linux_enu.tar.bz2) = 60286782 diff --git a/print/acroread9/files/pkg-message.in b/print/acroread9/files/pkg-message.in index 6618c46e931c..3fea7e7889d2 100644 --- a/print/acroread9/files/pkg-message.in +++ b/print/acroread9/files/pkg-message.in @@ -1,16 +1,13 @@ === WARNING === -Adobe Reader 9 is currently not compatible with the latest version of -Linux emulation on FreeBSD. Specifically, you may see the following -error message: +Before using Adobe Reader 9, linux_adobe.ko kernel module has to be loaded. +It is automatically loaded by %%PREFIX%%/etc/rc.d/linux_adobe script on +boot time. You can manually load it by - terminate called after throwing an instance of 'RSException' + # %%PREFIX%%/etc/rc.d/linux_adobe start -If this happens, please try print/acroread8 instead. Developments for -improving the compatibility are in progress. If you have any questions -on this port, contact hrs@FreeBSD.org. +without rebooting. -== -To run this, set ADOBE_LANG=%%ADOBE_LANG%% and use %%PREFIX%%/bin/acroread. -(when LANG is set, ADOBE_LANG will be set automatically based on it) -== +To run this version of Adobe Reader, set ADOBE_LANG=%%ADOBE_LANG%% and use +%%PREFIX%%/bin/acroread. Note that when $LANG is set, $ADOBE_LANG will be set +automatically based on it. diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile index 16d8c6a3ca4c..5e8a51a96711 100644 --- a/print/acroreadwrapper/Makefile +++ b/print/acroreadwrapper/Makefile @@ -6,10 +6,10 @@ # PORTNAME= acroreadwrapper -PORTVERSION= 0.0.20100806 +PORTVERSION= 0.0.20110529 CATEGORIES= print -MASTER_SITES= # empty -DISTFILES= # empty +MASTER_SITES= http://people.allbsd.org/~hrs/FreeBSD/ +DISTNAME= linux_adobe_kmod-${PORTVERSION:S,0.0.,,} MAINTAINER= hrs@FreeBSD.org COMMENT= Wrapper script for Adobe Reader @@ -17,9 +17,10 @@ COMMENT= Wrapper script for Adobe Reader RUN_DEPENDS= ${LOCALBASE}/lib/linux-libgtkembedmoz/libgtkembedmoz.so:${PORTSDIR}/www/linux-libgtkembedmoz ONLY_FOR_ARCHS= amd64 i386 -NO_BUILD= yes -PLIST_FILES= bin/acroread8 bin/acroread9 bin/acroread -SUB_FILES= acroread +PLIST_FILES= bin/acroread8 bin/acroread9 bin/acroread \ + ${KMODDIR}/linux_adobe.ko +PLIST_DIRS= ${KMODDIR} +SUB_FILES= acroread SUB_LIST= ACROBASE8=${ACROBASE8} \ ACROBASE9=${ACROBASE9} \ ADOBE_LANG=${ADOBE_LANG:U} \ @@ -27,18 +28,28 @@ SUB_LIST= ACROBASE8=${ACROBASE8} \ LINUXBASE=${LINUXBASE} \ LINUXSH=${LINUXBASE}/bin/sh \ PLUGINDIR=${PLUGINDIR} \ + KMODDIR=${KMODDIR} +USE_RC_SUBR= linux_adobe.sh +MAKE_ENV= KMODDIR=${KMODDIR} DESTDIR=${PREFIX}/ ADOBEBASE= Adobe ACROBASE8= ${ADOBEBASE}/Reader8 ACROBASE9= ${ADOBEBASE}/Reader9 PLUGINDIR= lib/npapi/linux-acroread +KMODDIR= libexec/linux_adobe -do-fetch: - @${DO_NADA} +.include <bsd.port.pre.mk> +KERNCONF?= GENERIC -do-install: +.if !exists(${SRC_BASE}/sys/${ARCH}/conf/${KERNCONF}) +IGNORE= requires kernel source to be installed +.endif + +post-install: + ${INSTALL_KLD} ${WRKSRC}/linux_adobe.ko \ + ${PREFIX}/libexec/linux_adobe/linux_adobe.ko ${INSTALL_SCRIPT} ${WRKDIR}/acroread ${PREFIX}/bin/acroread cd ${PREFIX}/bin && ${LN} -s -f acroread acroread8 cd ${PREFIX}/bin && ${LN} -s -f acroread acroread9 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/print/acroreadwrapper/distinfo b/print/acroreadwrapper/distinfo new file mode 100644 index 000000000000..a0698e42e2bd --- /dev/null +++ b/print/acroreadwrapper/distinfo @@ -0,0 +1,2 @@ +SHA256 (linux_adobe_kmod-20110529.tar.gz) = 3b477950cfe070f366e4099959ea778a448663895b39b709a13ad7edf899c4d0 +SIZE (linux_adobe_kmod-20110529.tar.gz) = 2023 diff --git a/print/acroreadwrapper/files/acroread.in b/print/acroreadwrapper/files/acroread.in index 322013cb1685..9c9052129b9d 100644 --- a/print/acroreadwrapper/files/acroread.in +++ b/print/acroreadwrapper/files/acroread.in @@ -126,6 +126,7 @@ case ${ADOBE_DISABLEIMMODULEHACK} in esac UNAME_s=Linux; export UNAME_s +GTK_PATH="${LINUXBASE}/usr/lib/gtk-2.0/"; export GTK_PATH if [ -x %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/acroread ]; then exec %%LINUXSH%% %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/acroread "$@" diff --git a/print/acroreadwrapper/files/linux_adobe.sh.in b/print/acroreadwrapper/files/linux_adobe.sh.in new file mode 100644 index 000000000000..8928a90976da --- /dev/null +++ b/print/acroreadwrapper/files/linux_adobe.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: linux_adobe +# REQUIRE: LOGIN abi +# KEYWORD: nojail + +. /etc/rc.subr + +name="linux_adobe" +rcvar=`set_rcvar` +start_cmd="linux_adobe_start" +stop_cmd="linux_adobe_stop" + +linux_adobe_start() +{ + load_kld %%PREFIX%%/%%KMODDIR%%/linux_adobe.ko +} +linux_adobe_stop() +{ + /sbin/kldunload linux_adobe +} + +: ${linux_adobe_enable="YES"} +load_rc_config $name +run_rc_command "$1" |