[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update: print/acroread



Hi!

The attached diff was sent to the Maintainer 10 days ago, I did not get
any response, so here it goes. Updates Acroread to 5.05. Works fine
here on 3.1.

bye,

Nikolay
diff -uNr --exclude=CVS /usr/ports/print/acroread/Makefile ./Makefile
--- /usr/ports/print/acroread/Makefile	Tue Nov 13 23:13:24 2001
+++ ./Makefile	Tue May 21 10:37:45 2002
@@ -8,12 +8,12 @@
 
 COMMENT=	"view, distribute and print PDF documents"
 
-DISTNAME=	linux-ar-405
-PKGNAME=	acroread-4.05
+DISTNAME=	linux-505
+PKGNAME=	acroread-5.05
 CATEGORIES=	print
-NEED_VERSION=	1.496
+NEED_VERSION=	1.531
 
-MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/4.x/
+MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 ONLY_FOR_ARCHS=	i386
 
 MAINTAINER=	Angelos D. Keromytis <angelos_(_at_)_openbsd_(_dot_)_org>
@@ -25,22 +25,18 @@
 
 RUN_DEPENDS=	::emulators/redhat/base
 
-WRKDIST=	${WRKDIR}/ILINXR.install
-
-do-build:
-	@${ECHO_MSG} "Do a \`make install' as root."
+WRKDIST=	${WRKDIR}
+NO_BUILD=	Yes
+NO_REGRESS=	Yes
 
 do-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat4
-	@ReadInstallDir=${PREFIX}/Acrobat4 ${WRKSRC}/INSTALL
+	@${INSTALL_DATA_DIR} ${PREFIX}/Acrobat5
+	@ReadInstallDir=${PREFIX}/Acrobat5 ${WRKSRC}/INSTALL
 
 post-install:
-	@cd ${PREFIX}/Acrobat4/bin && \
+	@cd ${PREFIX}/Acrobat5/bin && \
 	  patch --quiet < ${FILESDIR}/acroread.diff && \
-	  ${INSTALL_SCRIPT} ${PREFIX}/Acrobat4/bin/acroread \
+	  ${INSTALL_SCRIPT} ${PREFIX}/Acrobat5/bin/acroread \
 	     ${PREFIX}/bin/acroread && rm acroread.orig
-#	@chmod +x ${PREFIX}/bin/acroread
-	@echo "Be sure to read the license agreement in"
-	@echo "${PREFIX}/Acrobat4/Reader/License.pdf"
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS /usr/ports/print/acroread/distinfo ./distinfo
--- /usr/ports/print/acroread/distinfo	Thu Mar 21 21:20:51 2002
+++ ./distinfo	Tue May 21 09:59:32 2002
@@ -1,3 +1,3 @@
-MD5 (linux-ar-405.tar.gz) = ad40572f1f9972d2b91d01217a2b0f23
-RMD160 (linux-ar-405.tar.gz) = 80d0bb4d5360ed25ee5d6a98be924b8ea43058bd
-SHA1 (linux-ar-405.tar.gz) = b504f9101de8a65d7bec968f41f6532c2c392b85
+MD5 (linux-505.tar.gz) = 5c1cef0b5b1eb75ed01fefb3d6a88ce0
+RMD160 (linux-505.tar.gz) = af0f77ff0878ac1e2c49dd7643901609b1621403
+SHA1 (linux-505.tar.gz) = b85924cbb99aed87f2e1385551c936de8964a913
diff -uNr --exclude=CVS /usr/ports/print/acroread/files/acroread.diff ./files/acroread.diff
--- /usr/ports/print/acroread/files/acroread.diff	Wed Jul 14 12:55:44 1999
+++ ./files/acroread.diff	Tue May 21 10:17:29 2002
@@ -1,19 +1,12 @@
-*** acroread.orig	Mon Jul 12 17:43:51 1999
---- acroread	Mon Jul 12 17:45:23 1999
-***************
-*** 205,211 ****
-      ACRO_CONFIG=intelbsdi
-      export ACRO_CONFIG
-      ;;
-!   Linux)
-      ACRO_CONFIG=intellinux
-      export ACRO_CONFIG
-      ;;
---- 205,211 ----
-      ACRO_CONFIG=intelbsdi
-      export ACRO_CONFIG
-      ;;
-!   Linux|OpenBSD)
-      ACRO_CONFIG=intellinux
-      export ACRO_CONFIG
-      ;;
+$OpenBSD$
+--- acroread.orig	Tue May 21 10:14:05 2002
++++ acroread	Tue May 21 10:16:16 2002
+@@ -187,7 +187,7 @@
+         ;;
+     esac
+     ;;
+-   Linux)
++   OpenBSD|Linux)
+     ACRO_CONFIG=intellinux
+     export ACRO_CONFIG
+     ;;
diff -uNr --exclude=CVS /usr/ports/print/acroread/patches/patch-INSTALL ./patches/patch-INSTALL
--- /usr/ports/print/acroread/patches/patch-INSTALL	Thu Jan  1 01:00:00 1970
+++ ./patches/patch-INSTALL	Tue May 21 10:09:53 2002
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- INSTALL.orig	Tue May 21 10:02:18 2002
++++ INSTALL	Tue May 21 10:06:29 2002
+@@ -135,6 +135,8 @@ PrintRequiredFree()
+     if [ "$i" -a -f "$i" ] ; then
+         if [ `uname -s` = "Linux" ] ; then
+           size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
++        elif [ `uname -s` = "OpenBSD" ] ; then
++          size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
+         else
+           size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
+         fi
+@@ -209,7 +211,7 @@ InstallBin()
+ 
+       case "$product" in
+         Reader)
+-          replacement="$topdir"/"$product"
++          replacement="${TRUEPREFIX}/Acrobat5"/"$product"
+           ;;
+         *)
+           echo "ERROR installing $filename, invalid product name"
+@@ -344,7 +346,7 @@ InstallReader()
+   SearchPlatformTar="$3"
+   CustomPlatformTar="$4"
+ 
+-  OutputLicense "$ReadLicense"
++#  OutputLicense "$ReadLicense"
+   ReadLicense=""
+ 
+   PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
+@@ -524,7 +526,7 @@ case "$OSname" in
+       ;;
+     esac
+     ;;
+-  Linux)
++  OpenBSD|Linux)
+     ReadDefaultNum="$ReadIntelLinuxNum"
+     DefaultName="Intel/Linux"
+     ;;
diff -uNr --exclude=CVS /usr/ports/print/acroread/patches/patch-aa ./patches/patch-aa
--- /usr/ports/print/acroread/patches/patch-aa	Tue Feb 13 21:15:37 2001
+++ ./patches/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,59 +0,0 @@
---- INSTALL.orig	Thu Jan 27 01:36:14 2000
-+++ INSTALL	Tue Feb 13 17:04:34 2001
-@@ -115,6 +115,8 @@ PrintRequiredFree()
-     if [ "$i" -a -f "$i" ] ; then
-         if [ `uname -s` = "Linux" ] ; then
-           size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
-+        elif [ `uname -s` = "OpenBSD" ] ; then
-+          size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
-         else
-           size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
-         fi
-@@ -157,9 +159,9 @@ ExtractFiles ()
-    uid=`expr "$id_out" : 'uid=[0-9]*(\([^)]*\))'`
-    gid=`expr "$id_out" : '[^ ]* gid=[0-9]*(\([^)]*\))'`
-   if [ "$uid" = "root" ] ; then
--    ( cd "$1" ; tar xfo "$2" ; chown -R $uid . ; chgrp -R $gid . )
-+    ( cd "$1" ; tar xf "$2" ; chown -R $uid . ; chgrp -R $gid . )
-   else
--    ( cd "$1" ; tar xfo "$2" )
-+    ( cd "$1" ; tar xf "$2" )
-   fi
- }
- 
-@@ -198,7 +200,7 @@ InstallBin()
- 
-       case "$product" in
-         Exchange|Reader)
--          replacement="$topdir"/"$product"
-+          replacement="${TRUEPREFIX}/Acrobat4"/"$product"
-           ;;
-         Distillr)
-           replacement="$topdir"
-@@ -490,7 +492,7 @@ InstallReader()
-   SearchPlatformTar="$3"
-   CustomPlatformTar="$4"
- 
--  OutputLicense "$ReadLicense"
-+#  OutputLicense "$ReadLicense"
-   ReadLicense=""
- 
-   PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
-@@ -563,7 +565,7 @@ case "${ScriptDirectory}" in
-   *) ScriptDirectory="$CurrentDirectory"/"$ScriptDirectory" ;;
- esac
- 
--if [ "`type uname`" != "uname not found" ] ; then
-+if [ "`uname`" != "uname not found" ] ; then
-   OSname=`uname -s`
-   if [ "$OSname" = "AIX" ] ; then
-     OSrelease=`uname -a | ( read name host minor major foo ; echo $major.$minor )`
-@@ -1048,7 +1050,7 @@ case "$OSname" in
-     DistDefaultNum="$DistIntelBSDINum"
-     DefaultName="Intel/BSDI"
-     ;;
--  Linux)
-+  OpenBSD|Linux)
-     AcroDefaultNum="$AcroIntelLinuxNum"
-     ExchDefaultNum="$ExchIntelLinuxNum"
-     ReadDefaultNum="$ReadIntelLinuxNum"
diff -uNr --exclude=CVS /usr/ports/print/acroread/pkg/MESSAGE ./pkg/MESSAGE
--- /usr/ports/print/acroread/pkg/MESSAGE	Thu Jan  1 01:00:00 1970
+++ ./pkg/MESSAGE	Tue May 21 10:32:30 2002
@@ -0,0 +1,8 @@
+
++------------------------------------
+|
+| Be sure to read the license agreement in
+| ${PREFIX}/Acrobat5/Reader/license.txt
+|
++------------------------------------
+
diff -uNr --exclude=CVS /usr/ports/print/acroread/pkg/PFRAG.shared ./pkg/PFRAG.shared
--- /usr/ports/print/acroread/pkg/PFRAG.shared	Thu Jan  1 01:00:00 1970
+++ ./pkg/PFRAG.shared	Tue May 21 10:18:40 2002
@@ -0,0 +1,7 @@
+_(_at_)_comment $OpenBSD$
+Acrobat5/Reader/intellinux/lib/libACE.so.2.02
+Acrobat5/Reader/intellinux/lib/libAGM.so.4.08
+Acrobat5/Reader/intellinux/lib/libBIB.so.1.1
+Acrobat5/Reader/intellinux/lib/libCoolType.so.3.06
+Acrobat5/Reader/intellinux/lib/libOPP.so.1.02
+NEWDYNLIBDIR(%D/Acrobat5/Reader/intellinux/lib)
diff -uNr --exclude=CVS /usr/ports/print/acroread/pkg/PLIST ./pkg/PLIST
--- /usr/ports/print/acroread/pkg/PLIST	Tue Feb 13 21:15:37 2001
+++ ./pkg/PLIST	Tue May 21 10:18:40 2002
@@ -1,68 +1,66 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.5 2001/02/13 20:15:37 espie Exp $
-Acrobat4/Browsers/intellinux/nppdf.so
-Acrobat4/Browsers/netscape
-Acrobat4/ReadMe
-Acrobat4/Reader/AcroVersion
-Acrobat4/Reader/Acrobat.pdf
-Acrobat4/Reader/License.pdf
-Acrobat4/Reader/MapTypes.pdf
-Acrobat4/Reader/help/reader.pdf
-Acrobat4/Reader/intellinux/app-defaults/AcroRead
-Acrobat4/Reader/intellinux/bin/acroread
-Acrobat4/Reader/intellinux/fonts
-Acrobat4/Reader/intellinux/lib/XKeysymDB
-Acrobat4/Reader/intellinux/lib/libAGM.so
-Acrobat4/Reader/intellinux/lib/libCoolType.so
-Acrobat4/Reader/intellinux/lib/libICC.so
-Acrobat4/Reader/intellinux/lib/libreadcore.so
-Acrobat4/Reader/intellinux/plug_ins/AcroForm.api
-Acrobat4/Reader/intellinux/plug_ins/Highlight.api
-Acrobat4/Reader/intellinux/plug_ins/JavaScripts/AFStrENU.js
-Acrobat4/Reader/intellinux/plug_ins/JavaScripts/AForm.js
-Acrobat4/Reader/intellinux/plug_ins/ewh.api
-Acrobat4/Reader/intellinux/plug_ins/wwwlink.api
-Acrobat4/Reader/intellinux/res
-Acrobat4/Reader/res/splashScreen11R.xbm
-Acrobat4/Reader/res/splashScreen18R.xpm
-Acrobat4/Reader/res/splashScreen21.xbm
-Acrobat4/Reader/res/splashScreen28.xpm
-Acrobat4/Resource/Font/AdobeSansMM
-Acrobat4/Resource/Font/AdobeSansMM.MMM
-Acrobat4/Resource/Font/AdobeSerifMM
-Acrobat4/Resource/Font/AdobeSerifMM.MMM
-Acrobat4/Resource/Font/Arial
-Acrobat4/Resource/Font/Arial-Bold
-Acrobat4/Resource/Font/Arial-BoldItalic
-Acrobat4/Resource/Font/Arial-Italic
-Acrobat4/Resource/Font/Courier
-Acrobat4/Resource/Font/Courier-Bold
-Acrobat4/Resource/Font/Courier-BoldOblique
-Acrobat4/Resource/Font/Courier-Oblique
-Acrobat4/Resource/Font/Fonts14.upr
-Acrobat4/Resource/Font/Symbol
-Acrobat4/Resource/Font/TimesNewRoman
-Acrobat4/Resource/Font/TimesNewRoman-Bold
-Acrobat4/Resource/Font/TimesNewRoman-BoldItalic
-Acrobat4/Resource/Font/TimesNewRoman-Italic
-Acrobat4/Resource/Font/ZapfDingbats
-Acrobat4/bin/acroread
+_(_at_)_comment $OpenBSD$
+Acrobat5/Browsers/intellinux/nppdf.so
+Acrobat5/Browsers/netscape
+Acrobat5/Reader/AcroVersion
+Acrobat5/Reader/MapTypes.pdf
+Acrobat5/Reader/help/acrobat.pdf
+Acrobat5/Reader/help/reader.pdf
+Acrobat5/Reader/intellinux/app-defaults/AcroRead
+Acrobat5/Reader/intellinux/bin/acroread
+Acrobat5/Reader/intellinux/fonts
+Acrobat5/Reader/intellinux/lib/XKeysymDB
+Acrobat5/Reader/intellinux/lib/libACE.so
+Acrobat5/Reader/intellinux/lib/libAGM.so
+Acrobat5/Reader/intellinux/lib/libBIB.so
+Acrobat5/Reader/intellinux/lib/libCoolType.so
+Acrobat5/Reader/intellinux/lib/libOPP.so
+Acrobat5/Reader/intellinux/plug_ins/AcroForm.api
+Acrobat5/Reader/intellinux/plug_ins/EScript.api
+Acrobat5/Reader/intellinux/plug_ins/Highlight.api
+Acrobat5/Reader/intellinux/plug_ins/JavaScripts/AFStrENU.js
+Acrobat5/Reader/intellinux/plug_ins/JavaScripts/AForm.js
+Acrobat5/Reader/intellinux/plug_ins/ewh.api
+Acrobat5/Reader/intellinux/plug_ins/wwwlink.api
+Acrobat5/Reader/intellinux/res
+Acrobat5/Reader/license.txt
+Acrobat5/Reader/res/ENUtxt.pdf
+Acrobat5/Reader/res/splashScreen11R.xbm
+Acrobat5/Reader/res/splashScreen18R.xpm
+Acrobat5/Resource/Font/AdobeSansMM
+Acrobat5/Resource/Font/AdobeSansMM.MMM
+Acrobat5/Resource/Font/AdobeSerifMM
+Acrobat5/Resource/Font/AdobeSerifMM.MMM
+Acrobat5/Resource/Font/Arial
+Acrobat5/Resource/Font/Arial-Bold
+Acrobat5/Resource/Font/Arial-BoldItalic
+Acrobat5/Resource/Font/Arial-Italic
+Acrobat5/Resource/Font/Courier
+Acrobat5/Resource/Font/Courier-Bold
+Acrobat5/Resource/Font/Courier-BoldOblique
+Acrobat5/Resource/Font/Courier-Oblique
+Acrobat5/Resource/Font/Fonts14.upr
+Acrobat5/Resource/Font/Symbol
+Acrobat5/Resource/Font/TimesNewRoman
+Acrobat5/Resource/Font/TimesNewRoman-Bold
+Acrobat5/Resource/Font/TimesNewRoman-BoldItalic
+Acrobat5/Resource/Font/TimesNewRoman-Italic
+Acrobat5/Resource/Font/ZapfDingbats
+Acrobat5/Resource/LICFONT.TXT
+Acrobat5/bin/acroread
 bin/acroread
-Acrobat4/Reader/intellinux/lib/libAGM.so.3.0
-Acrobat4/Reader/intellinux/lib/libCoolType.so.1.0
-Acrobat4/Reader/intellinux/lib/libICC.so.1.0
-Acrobat4/Reader/intellinux/lib/libreadcore.so.4.0
-_(_at_)_dirrm Acrobat4/bin
-_(_at_)_dirrm Acrobat4/Resource/Font
-_(_at_)_dirrm Acrobat4/Resource
-_(_at_)_dirrm Acrobat4/Reader/res
-_(_at_)_dirrm Acrobat4/Reader/intellinux/plug_ins/JavaScripts
-_(_at_)_dirrm Acrobat4/Reader/intellinux/plug_ins
-_(_at_)_dirrm Acrobat4/Reader/intellinux/lib
-_(_at_)_dirrm Acrobat4/Reader/intellinux/bin
-_(_at_)_dirrm Acrobat4/Reader/intellinux/app-defaults
-_(_at_)_dirrm Acrobat4/Reader/intellinux
-_(_at_)_dirrm Acrobat4/Reader/help
-_(_at_)_dirrm Acrobat4/Reader
-_(_at_)_dirrm Acrobat4/Browsers/intellinux
-_(_at_)_dirrm Acrobat4/Browsers
-_(_at_)_dirrm Acrobat4
+%%SHARED%%
+_(_at_)_dirrm Acrobat5/bin
+_(_at_)_dirrm Acrobat5/Resource/Font
+_(_at_)_dirrm Acrobat5/Resource
+_(_at_)_dirrm Acrobat5/Reader/res
+_(_at_)_dirrm Acrobat5/Reader/intellinux/plug_ins/JavaScripts
+_(_at_)_dirrm Acrobat5/Reader/intellinux/plug_ins
+_(_at_)_dirrm Acrobat5/Reader/intellinux/lib
+_(_at_)_dirrm Acrobat5/Reader/intellinux/bin
+_(_at_)_dirrm Acrobat5/Reader/intellinux/app-defaults
+_(_at_)_dirrm Acrobat5/Reader/intellinux
+_(_at_)_dirrm Acrobat5/Reader/help
+_(_at_)_dirrm Acrobat5/Reader
+_(_at_)_dirrm Acrobat5/Browsers/intellinux
+_(_at_)_dirrm Acrobat5/Browsers
+_(_at_)_dirrm Acrobat5

Visit your host, monkey.org