Hi,
this is an update of acroread to the current version 7.0.8, it requires
the fedora_base port I just posted. Please test and comment.
Nikolay
--
"It's all part of my Can't-Do approach to life." Wally
Logfile: /tmp/cvsd.DsxuU2144
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/Makefile,v
retrieving revision 1.27
diff -p -u -r1.27 Makefile
--- Makefile 20 Aug 2005 09:02:16 -0000 1.27
+++ Makefile 13 Oct 2006 16:47:26 -0000
@@ -1,15 +1,25 @@
# $OpenBSD: Makefile,v 1.27 2005/08/20 09:02:16 sturm Exp $
ONLY_FOR_ARCHS= i386
+SHARED_ONLY= Yes
COMMENT= "view, distribute and print PDF documents"
COMMENT-plugins="further plugins for acrobat reader"
-V= 7.0.1
-DISTNAME= AdbeRdr701_linux_enu
+V= 7.0.8
+DISTNAME= AdobeReader_enu-${V}-1.i386
PKGNAME= acroread-${V}
PKGNAME-plugins=acroread-plugins-${V}
CATEGORIES= print
+SHARED_LIBS= ACE 2.07 \
+ AGM 4.14 \
+ BIB 1.1 \
+ CoolType 5.01 \
+ ResAccess 0.1 \
+ aglcnv 28.0 \
+ agldata 28.0 \
+ agli18n 28.0 \
+ agluc 28.0
MAINTAINER= Nikolay Sturm <[EMAIL PROTECTED]>
@@ -21,9 +31,9 @@ PERMIT_DISTFILES_FTP= "Adobe are control
MULTI_PACKAGES= -plugins
SUBPACKAGE?=
-MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/
+MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/${V}/enu/
-RUN_DEPENDS= :redhat_base->8.0p4:emulators/redhat/base
+RUN_DEPENDS= ::emulators/fedora/base
.if defined(PACKAGING) && ${SUBPACKAGE} == "-plugins"
RUN_DEPENDS+= :${PKGNAME}:print/acroread
@@ -35,13 +45,14 @@ NO_REGRESS= Yes
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat7
- @ReadInstallDir=${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
+ @InstallDir=${PREFIX}/Acrobat7 ${WRKSRC}/INSTALL
post-install:
@cd ${PREFIX}/Acrobat7/bin && \
patch --quiet < ${FILESDIR}/acroread.diff && \
+ rm acroread.orig && \
perl -pi -e "s,%%TRUEPREFIX%%,${TRUEPREFIX}," acroread && \
${INSTALL_SCRIPT} ${PREFIX}/Acrobat7/bin/acroread \
- ${PREFIX}/bin/acroread && rm acroread.orig
+ ${PREFIX}/bin/acroread
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/distinfo,v
retrieving revision 1.10
diff -p -u -r1.10 distinfo
--- distinfo 20 Aug 2005 09:02:16 -0000 1.10
+++ distinfo 13 Oct 2006 16:47:26 -0000
@@ -1,4 +1,4 @@
-MD5 (AdbeRdr701_linux_enu.tar.gz) = 79e5a40aca6b49f7015cb1694876f87a
-RMD160 (AdbeRdr701_linux_enu.tar.gz) = 809bd29984e3d67bac51ce93cf2ce22f43c1b331
-SHA1 (AdbeRdr701_linux_enu.tar.gz) = ab2c83ff58f1e71d29051c95ce745c0bafb77dea
-SIZE (AdbeRdr701_linux_enu.tar.gz) = 39476166
+MD5 (AdobeReader_enu-7.0.8-1.i386.tar.gz) = 4834f13ee45c7b1be263fb89aa49d212
+RMD160 (AdobeReader_enu-7.0.8-1.i386.tar.gz) =
22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983
+SHA1 (AdobeReader_enu-7.0.8-1.i386.tar.gz) =
ed3f955a0e9ba252fcb45263de00a37e392b7b72
+SIZE (AdobeReader_enu-7.0.8-1.i386.tar.gz) = 44150042
cvs diff: Diffing files
Index: files/acroread.diff
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/files/acroread.diff,v
retrieving revision 1.3
diff -p -u -r1.3 acroread.diff
--- files/acroread.diff 17 Apr 2005 07:18:53 -0000 1.3
+++ files/acroread.diff 13 Oct 2006 16:47:26 -0000
@@ -1,7 +1,7 @@
---- acroread.orig Sat Mar 12 02:50:00 2005
-+++ acroread Wed Apr 6 23:32:51 2005
-@@ -14,7 +14,7 @@
- ScriptDirectory="`pwd 2> /dev/null`"
+--- acroread.orig Tue May 23 03:33:35 2006
++++ acroread Sun Oct 8 20:57:19 2006
+@@ -233,7 +233,7 @@
+ ScriptDirectory="`/bin/pwd 2> /dev/null`"
cd "$cwd"
fi
-install_dir=`dirname "$ScriptDirectory"`/Reader
@@ -9,12 +9,21 @@
#
-@@ -168,7 +168,7 @@
+@@ -476,7 +476,7 @@
+ OLD_IFS=""
+
+ # This checks for libs in cache /etc/ld.so.cache
+- for ifile in `/sbin/ldconfig -p|grep "libgtk-x11-2.0.so$"|sed 's/.*[
\t]*=>[ \t]*\(.*\)/\1/g' 2>/dev/null`; do
++ for ifile in `/emul/linux/sbin/ldconfig -p|grep "libgtk-x11-2.0.so$"|sed
's/.*[ \t]*=>[ \t]*\(.*\)/\1/g' 2>/dev/null`; do
+ version=`get_gtk_file_ver "$ifile"`
+
+ while [ ${#version} -gt ${#base_version} ]; do
+@@ -610,7 +610,7 @@
;;
esac
;;
-- Linux)
-+ OpenBSD|Linux)
+- Linux)
++ OpenBSD|Linux)
ACRO_CONFIG=intellinux
export ACRO_CONFIG
;;
cvs diff: Diffing patches
Index: patches/patch-INSTALL
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/patches/patch-INSTALL,v
retrieving revision 1.3
diff -p -u -r1.3 patch-INSTALL
--- patches/patch-INSTALL 20 Aug 2005 09:02:16 -0000 1.3
+++ patches/patch-INSTALL 13 Oct 2006 16:47:26 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-INSTALL,v 1.3 2005/08/20 09:02:16 sturm Exp $
---- INSTALL.orig Thu Jul 28 21:02:57 2005
-+++ INSTALL Sat Aug 20 01:32:59 2005
-@@ -160,6 +160,8 @@ PrintRequiredFree()
+--- INSTALL.orig Tue May 23 03:33:34 2006
++++ INSTALL Sun Oct 8 20:50:06 2006
+@@ -287,6 +287,8 @@ PrintRequiredFree()
if [ `uname -s` = "Linux" ] ; then
size=`ls -lLn "$i" | ( read perm links owner group size date ; echo
$size )`
@@ -10,24 +10,32 @@ $OpenBSD: patch-INSTALL,v 1.3 2005/08/20
else
size=`ls -lLon "$i" | ( read perm links owner size date ; echo
$size )`
fi
-@@ -379,7 +381,7 @@ InstallReader()
- CustomPlatformTar="$4"
-
-
-- OutputLicense "$ReadLicense"
-+ # OutputLicense "$ReadLicense"
- ReadLicense=""
+@@ -589,7 +591,7 @@ InstallBrowserPlugin()
+ while :
+ do
+ $echonl "$ST_IBP_INFO_20 [$ST_SMALL_Y/$ST_SMALL_N] "
+- read OVERWRITE_CHOICE
++ OVERWRITE_CHOICE="n"
+
+ if [ "$OVERWRITE_CHOICE" = "$ST_SMALL_Y" ] || [ "$OVERWRITE_CHOICE" =
"$ST_CAPS_Y" ] || [ -z "$OVERWRITE_CHOICE" ]
+ then
+@@ -806,15 +808,6 @@ InstallReader()
+ echo "$ST_IBP_INFO_22_1"
\"$ReadInstallDir/Browser/install_browser_plugin\" "$ST_IBP_INFO_22_2"
+ fi
- PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
-@@ -425,7 +427,6 @@ eval ScriptDirectory=\"${ScriptDirectory
+- rm -f /usr/bin/acroread 2>/dev/null
+- ln -s "$ReadInstallDir"/bin/acroread /usr/bin/acroread 2>/dev/null
+-
+- rm -f /usr/share/applications/AdobeReader.desktop 2>/dev/null
+- ln -s "$ReadInstallDir"/Resource/Support/AdobeReader_GNOME.desktop
/usr/share/applications/AdobeReader.desktop 2>/dev/null
+-
+- rm -f /usr/share/pixmaps/AdobeReader.desktop 2>/dev/null
+- ln -s "$ReadInstallDir"/Resource/Icons/AdobeReader.png
/usr/share/pixmaps/AdobeReader.png 2>/dev/null
+-
+ if [ "`uname -s`" = "Linux" ]; then
+ check_file_in_path kde-config >/dev/null
- AcroSerNum=""
- AcroCompName=""
--ReadInstallDir=""
- case "${ScriptDirectory}" in
- /*) ;;
- .) ScriptDirectory="$CurrentDirectory" ;;
-@@ -571,7 +572,7 @@ case "$OSname" in
+@@ -1069,7 +1062,7 @@ case "$OSname" in
;;
esac
;;
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/pkg/PLIST,v
retrieving revision 1.11
diff -p -u -r1.11 PLIST
--- pkg/PLIST 17 Apr 2005 07:18:53 -0000 1.11
+++ pkg/PLIST 13 Oct 2006 17:04:34 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.11 2005/04/17 07:18:53 sturm Exp $
Acrobat7/
Acrobat7/Browser/
-Acrobat7/Browser/Browser_Plugin_HowTo.txt
+Acrobat7/Browser/HowTo/
+Acrobat7/Browser/HowTo/ENU/
+Acrobat7/Browser/HowTo/ENU/Browser_Plugin_HowTo.txt
Acrobat7/Browser/install_browser_plugin
Acrobat7/Browser/intellinux/
Acrobat7/Browser/intellinux/nppdf.so
@@ -10,8 +12,7 @@ Acrobat7/Reader/AcroVersion
Acrobat7/Reader/Cert/
Acrobat7/Reader/Cert/curl-ca-bundle.crt
Acrobat7/Reader/GlobalPrefs/
-Acrobat7/Reader/GlobalPrefs/AttachmentPerms
-Acrobat7/Reader/GlobalPrefs/URLPerms
+Acrobat7/Reader/GlobalPrefs/reader_prefs
Acrobat7/Reader/HowTo/
Acrobat7/Reader/HowTo/ENU/
Acrobat7/Reader/HowTo/ENU/Forms.html
@@ -122,17 +123,20 @@ Acrobat7/Reader/JavaScripts/JSByteCodeLi
Acrobat7/Reader/JavaScripts/WebSearch.js
Acrobat7/Reader/Legal/
Acrobat7/Reader/Legal/ENU/
+Acrobat7/Reader/Legal/ENU/LGPL.html
Acrobat7/Reader/Legal/ENU/License.html
Acrobat7/Reader/Legal/ENU/license_ENU_uc.txt
Acrobat7/Reader/Messages/
Acrobat7/Reader/Messages/ENU/
Acrobat7/Reader/Messages/ENU/RdrMsgENU.pdf
Acrobat7/Reader/Messages/RdrMsgSplash.pdf
+Acrobat7/Reader/Patch/
+Acrobat7/Reader/Patch/selinux_patch
Acrobat7/Reader/WebSearch/
Acrobat7/Reader/WebSearch/WebSearchENU.pdf
Acrobat7/Reader/help/
Acrobat7/Reader/help/ENU/
-Acrobat7/Reader/help/ENU/README
+Acrobat7/Reader/help/ENU/ReadMe.htm
Acrobat7/Reader/help/ENU/Reader.pdf
Acrobat7/Reader/intellinux/
Acrobat7/Reader/intellinux/SPPlugins/
@@ -141,40 +145,41 @@ Acrobat7/Reader/intellinux/bin/
Acrobat7/Reader/intellinux/bin/acroread
Acrobat7/Reader/intellinux/lib/
Acrobat7/Reader/intellinux/lib/libACE.so
-Acrobat7/Reader/intellinux/lib/libACE.so.2.07
+Acrobat7/Reader/intellinux/lib/libACE.so.${LIBACE_VERSION}
Acrobat7/Reader/intellinux/lib/libAGM.so
-Acrobat7/Reader/intellinux/lib/libAGM.so.4.14
+Acrobat7/Reader/intellinux/lib/libAGM.so.${LIBAGM_VERSION}
Acrobat7/Reader/intellinux/lib/libAXE16SharedExpat.so
Acrobat7/Reader/intellinux/lib/libAXE8SharedExpat.so
Acrobat7/Reader/intellinux/lib/libAXSLE.so
Acrobat7/Reader/intellinux/lib/libBIB.so
-Acrobat7/Reader/intellinux/lib/libBIB.so.1.1
+Acrobat7/Reader/intellinux/lib/libBIB.so.${LIBBIB_VERSION}
Acrobat7/Reader/intellinux/lib/libCoolType.so
-Acrobat7/Reader/intellinux/lib/libCoolType.so.5.01
+Acrobat7/Reader/intellinux/lib/libCoolType.so.${LIBCoolType_VERSION}
Acrobat7/Reader/intellinux/lib/libJP2K.so
Acrobat7/Reader/intellinux/lib/libResAccess.so
-Acrobat7/Reader/intellinux/lib/libResAccess.so.0.1
+Acrobat7/Reader/intellinux/lib/libResAccess.so.${LIBResAccess_VERSION}
Acrobat7/Reader/intellinux/lib/libWRServices.so
Acrobat7/Reader/intellinux/lib/libadobelinguistic.so.2
Acrobat7/Reader/intellinux/lib/libadobelinguistic.so.2.0.0
Acrobat7/Reader/intellinux/lib/libaglcnv.so
Acrobat7/Reader/intellinux/lib/libaglcnv.so.28
-Acrobat7/Reader/intellinux/lib/libaglcnv.so.28.0
+Acrobat7/Reader/intellinux/lib/libaglcnv.so.${LIBaglcnv_VERSION}
Acrobat7/Reader/intellinux/lib/libagldata.so
Acrobat7/Reader/intellinux/lib/libagldata.so.28
-Acrobat7/Reader/intellinux/lib/libagldata.so.28.0
+Acrobat7/Reader/intellinux/lib/libagldata.so.${LIBagldata_VERSION}
Acrobat7/Reader/intellinux/lib/libagli18n.so
Acrobat7/Reader/intellinux/lib/libagli18n.so.28
-Acrobat7/Reader/intellinux/lib/libagli18n.so.28.0
+Acrobat7/Reader/intellinux/lib/libagli18n.so.${LIBagli18n_VERSION}
Acrobat7/Reader/intellinux/lib/libagluc.so
Acrobat7/Reader/intellinux/lib/libagluc.so.28
-Acrobat7/Reader/intellinux/lib/libagluc.so.28.0
+Acrobat7/Reader/intellinux/lib/libagluc.so.${LIBagluc_VERSION}
Acrobat7/Reader/intellinux/lib/libcrypto.so
Acrobat7/Reader/intellinux/lib/libcrypto.so.0
Acrobat7/Reader/intellinux/lib/libcrypto.so.0.9.6
Acrobat7/Reader/intellinux/lib/libcurl.so
Acrobat7/Reader/intellinux/lib/libcurl.so.2
Acrobat7/Reader/intellinux/lib/libcurl.so.2.0.2
+Acrobat7/Reader/intellinux/lib/librt3d.so
Acrobat7/Reader/intellinux/lib/libssl.so
Acrobat7/Reader/intellinux/lib/libssl.so.0
Acrobat7/Reader/intellinux/lib/libssl.so.0.9.6
@@ -207,6 +212,66 @@ Acrobat7/Resource/Font/SY______.PFB
Acrobat7/Resource/Font/ZX______.PFB
Acrobat7/Resource/Font/ZY______.PFB
Acrobat7/Resource/Icons/
+Acrobat7/Resource/Icons/128x128/
+Acrobat7/Resource/Icons/128x128/AdobeReader.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/128x128/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/128x128/vnd.fdf.png
+Acrobat7/Resource/Icons/16x16/
+Acrobat7/Resource/Icons/16x16/AdobeReader.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/16x16/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/16x16/vnd.fdf.png
+Acrobat7/Resource/Icons/192x192/
+Acrobat7/Resource/Icons/192x192/AdobeReader.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/192x192/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/192x192/vnd.fdf.png
+Acrobat7/Resource/Icons/20x20/
+Acrobat7/Resource/Icons/20x20/AdobeReader.png
+Acrobat7/Resource/Icons/20x20/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/20x20/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/20x20/vnd.fdf.png
+Acrobat7/Resource/Icons/20x20/xdp.png
+Acrobat7/Resource/Icons/24x24/
+Acrobat7/Resource/Icons/24x24/AdobeReader.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/24x24/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/24x24/vnd.fdf.png
+Acrobat7/Resource/Icons/32x32/
+Acrobat7/Resource/Icons/32x32/AdobeReader.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/32x32/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/32x32/vnd.fdf.png
+Acrobat7/Resource/Icons/36x36/
+Acrobat7/Resource/Icons/36x36/AdobeReader.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/36x36/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/36x36/vnd.fdf.png
+Acrobat7/Resource/Icons/48x48/
+Acrobat7/Resource/Icons/48x48/AdobeReader.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/48x48/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/48x48/vnd.fdf.png
+Acrobat7/Resource/Icons/64x64/
+Acrobat7/Resource/Icons/64x64/AdobeReader.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/64x64/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/64x64/vnd.fdf.png
+Acrobat7/Resource/Icons/96x96/
+Acrobat7/Resource/Icons/96x96/AdobeReader.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.pdx.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.xdp+xml.png
+Acrobat7/Resource/Icons/96x96/vnd.adobe.xfdf.png
+Acrobat7/Resource/Icons/96x96/vnd.fdf.png
Acrobat7/Resource/Icons/AdobeReader.png
Acrobat7/Resource/Linguistics/
Acrobat7/Resource/Linguistics/LanguageNames/
@@ -218,19 +283,25 @@ Acrobat7/Resource/Linguistics/Providers/
Acrobat7/Resource/Linguistics/Providers/Proximity/brt0402.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/brt32.clx
Acrobat7/Resource/Linguistics/Providers/Proximity/brtphon.env
-Acrobat7/Resource/Linguistics/Providers/Proximity/can112.lex
+Acrobat7/Resource/Linguistics/Providers/Proximity/can129.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/can32.clx
Acrobat7/Resource/Linguistics/Providers/Proximity/canphon.env
Acrobat7/Resource/Linguistics/Providers/Proximity/eng32.clx
Acrobat7/Resource/Linguistics/Providers/Proximity/engphon.env
+Acrobat7/Resource/Linguistics/Providers/Proximity/usa03.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/usa86.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/usa8601.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/usa8602.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/usa8603.lex
Acrobat7/Resource/Linguistics/Providers/Proximity/usa8604.lex
Acrobat7/Resource/Support/
+Acrobat7/Resource/Support/AdobeReader.xml
Acrobat7/Resource/Support/AdobeReader_GNOME.desktop
Acrobat7/Resource/Support/AdobeReader_KDE.desktop
+Acrobat7/Resource/Support/vnd.adobe.pdx.desktop
+Acrobat7/Resource/Support/vnd.adobe.xdp+xml.desktop
+Acrobat7/Resource/Support/vnd.adobe.xfdf.desktop
+Acrobat7/Resource/Support/vnd.fdf.desktop
Acrobat7/bin/
Acrobat7/bin/acroread
bin/acroread
Index: pkg/PLIST-plugins
===================================================================
RCS file: /a/devel/cvs/ports/print/acroread/pkg/PLIST-plugins,v
retrieving revision 1.1
diff -p -u -r1.1 PLIST-plugins
--- pkg/PLIST-plugins 17 Apr 2005 07:18:53 -0000 1.1
+++ pkg/PLIST-plugins 13 Oct 2006 16:47:26 -0000
@@ -25,3 +25,9 @@ Acrobat7/Reader/intellinux/plug_ins/Spel
Acrobat7/Reader/intellinux/plug_ins/checkers.api
Acrobat7/Reader/intellinux/plug_ins/ewh.api
Acrobat7/Reader/intellinux/plug_ins/wwwlink.api
+Acrobat7/Reader/intellinux/plug_ins3d/
+Acrobat7/Reader/intellinux/plug_ins3d/2d.x3d
+Acrobat7/Reader/intellinux/plug_ins3d/3difr.x3d
+Acrobat7/Reader/intellinux/plug_ins3d/drvOpenGL.x3d
+Acrobat7/Reader/intellinux/plug_ins3d/drvSOFT.x3d
+Acrobat7/Reader/intellinux/plug_ins3d/tesselate.x3d
