Remove restrictions, the license seems to be liberal enough.

Now also works with a different $PREFIX.

9 files changed, 54 insertions, 42 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index d9c278a623fd..058205dd9d4c 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/20 07:29:45 tg Exp $
 #
 
 DISTNAME=	acroread_linux_b1106
@@ -16,18 +16,20 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
-RESTRICTED=	"Commercial software."
-IS_INTERACTIVE=	yes
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@${ECHO_MSG} "Do a \`make install' as root."
 
 do-install:
-	@${WRKDIR}/INSTALL
+	@mkdir -p ${PREFIX}/Acrobat3
+	@mkdir -p ${PREFIX}/bin
+	@ReadInstallDir=${PREFIX}/Acrobat3 ${WRKDIR}/INSTALL
 
 post-install:
 	@sed -e 's/Linux)/FreeBSD\|Linux)/' <${PREFIX}/Acrobat3/bin/acroread >${PREFIX}/bin/acroread
 	@chmod +x ${PREFIX}/bin/acroread
+	@${ECHO_MSG} "Be sure to read the license agreement in"
+	@${ECHO_MSG} "${PREFIX}/Acrobat3/Reader/License.pdf"
 
 .include <bsd.port.mk>
diff --git a/print/acroread/files/patch-aa b/print/acroread/files/patch-aa
index 92fa10bf43f3..96af67355cdb 100644
--- a/print/acroread/files/patch-aa
+++ b/print/acroread/files/patch-aa
@@ -1,14 +1,5 @@
 --- INSTALL.orig	Thu Nov  7 00:04:53 1996
-+++ INSTALL	Sat Nov 16 15:30:26 1996
-@@ -67,7 +67,7 @@
-     exit 1
-   fi
- 
--  if [ -z "$PAGER" ] || [ "`type $PAGER`" = "$PAGER not found" ] ; then
-+  if [ -z "$PAGER" ] || [ "`$PAGER`" = "$PAGER not found" ] ; then
-     if [ "`type more`" != "more not found" ] ; then
-       command=more
-     elif [ "`type pg`" != "pg not found" ] ; then
++++ INSTALL	Wed Nov 20 17:37:14 1996
 @@ -117,6 +117,8 @@
      if [ "$i" -a -f "$i" ] ; then
          if [ `uname -s` = "Linux" ] ; then
@@ -18,6 +9,15 @@
          else
            size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
          fi
+@@ -486,7 +488,7 @@
+   SearchPlatformTar="$3"
+   CustomPlatformTar="$4"
+ 
+-  OutputLicense "$ReadLicense"
++#  OutputLicense "$ReadLicense"
+   ReadLicense=""
+ 
+   PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
 @@ -559,7 +561,7 @@
    *) ScriptDirectory="$CurrentDirectory"/"$ScriptDirectory" ;;
  esac
diff --git a/print/acroread/pkg-plist b/print/acroread/pkg-plist
index 39a1f837aee9..219e01d920f2 100644
--- a/print/acroread/pkg-plist
+++ b/print/acroread/pkg-plist
@@ -45,3 +45,5 @@ Acrobat3/Reader/res/splashScreen21.xbm
 Acrobat3/Reader/res/splashScreen28.xpm
 Acrobat3/bin/acroread
 bin/acroread
+@exec echo "Be sure to read the license agreement in"
+@exec echo "%D/Acrobat3/Reader/License.pdf"
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index d9c278a623fd..058205dd9d4c 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/20 07:29:45 tg Exp $
 #
 
 DISTNAME=	acroread_linux_b1106
@@ -16,18 +16,20 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
-RESTRICTED=	"Commercial software."
-IS_INTERACTIVE=	yes
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@${ECHO_MSG} "Do a \`make install' as root."
 
 do-install:
-	@${WRKDIR}/INSTALL
+	@mkdir -p ${PREFIX}/Acrobat3
+	@mkdir -p ${PREFIX}/bin
+	@ReadInstallDir=${PREFIX}/Acrobat3 ${WRKDIR}/INSTALL
 
 post-install:
 	@sed -e 's/Linux)/FreeBSD\|Linux)/' <${PREFIX}/Acrobat3/bin/acroread >${PREFIX}/bin/acroread
 	@chmod +x ${PREFIX}/bin/acroread
+	@${ECHO_MSG} "Be sure to read the license agreement in"
+	@${ECHO_MSG} "${PREFIX}/Acrobat3/Reader/License.pdf"
 
 .include <bsd.port.mk>
diff --git a/print/acroread4/files/patch-aa b/print/acroread4/files/patch-aa
index 92fa10bf43f3..96af67355cdb 100644
--- a/print/acroread4/files/patch-aa
+++ b/print/acroread4/files/patch-aa
@@ -1,14 +1,5 @@
 --- INSTALL.orig	Thu Nov  7 00:04:53 1996
-+++ INSTALL	Sat Nov 16 15:30:26 1996
-@@ -67,7 +67,7 @@
-     exit 1
-   fi
- 
--  if [ -z "$PAGER" ] || [ "`type $PAGER`" = "$PAGER not found" ] ; then
-+  if [ -z "$PAGER" ] || [ "`$PAGER`" = "$PAGER not found" ] ; then
-     if [ "`type more`" != "more not found" ] ; then
-       command=more
-     elif [ "`type pg`" != "pg not found" ] ; then
++++ INSTALL	Wed Nov 20 17:37:14 1996
 @@ -117,6 +117,8 @@
      if [ "$i" -a -f "$i" ] ; then
          if [ `uname -s` = "Linux" ] ; then
@@ -18,6 +9,15 @@
          else
            size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
          fi
+@@ -486,7 +488,7 @@
+   SearchPlatformTar="$3"
+   CustomPlatformTar="$4"
+ 
+-  OutputLicense "$ReadLicense"
++#  OutputLicense "$ReadLicense"
+   ReadLicense=""
+ 
+   PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
 @@ -559,7 +561,7 @@
    *) ScriptDirectory="$CurrentDirectory"/"$ScriptDirectory" ;;
  esac
diff --git a/print/acroread4/pkg-plist b/print/acroread4/pkg-plist
index 39a1f837aee9..219e01d920f2 100644
--- a/print/acroread4/pkg-plist
+++ b/print/acroread4/pkg-plist
@@ -45,3 +45,5 @@ Acrobat3/Reader/res/splashScreen21.xbm
 Acrobat3/Reader/res/splashScreen28.xpm
 Acrobat3/bin/acroread
 bin/acroread
+@exec echo "Be sure to read the license agreement in"
+@exec echo "%D/Acrobat3/Reader/License.pdf"
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index d9c278a623fd..058205dd9d4c 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 November 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/20 07:29:45 tg Exp $
 #
 
 DISTNAME=	acroread_linux_b1106
@@ -16,18 +16,20 @@ MAINTAINER=	tg@FreeBSD.ORG
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.5:${PORTSDIR}/emulators/linux_lib
 
-RESTRICTED=	"Commercial software."
-IS_INTERACTIVE=	yes
 NO_WRKSUBDIR=	yes
 
 do-build:
 	@${ECHO_MSG} "Do a \`make install' as root."
 
 do-install:
-	@${WRKDIR}/INSTALL
+	@mkdir -p ${PREFIX}/Acrobat3
+	@mkdir -p ${PREFIX}/bin
+	@ReadInstallDir=${PREFIX}/Acrobat3 ${WRKDIR}/INSTALL
 
 post-install:
 	@sed -e 's/Linux)/FreeBSD\|Linux)/' <${PREFIX}/Acrobat3/bin/acroread >${PREFIX}/bin/acroread
 	@chmod +x ${PREFIX}/bin/acroread
+	@${ECHO_MSG} "Be sure to read the license agreement in"
+	@${ECHO_MSG} "${PREFIX}/Acrobat3/Reader/License.pdf"
 
 .include <bsd.port.mk>
diff --git a/print/acroread5/files/patch-aa b/print/acroread5/files/patch-aa
index 92fa10bf43f3..96af67355cdb 100644
--- a/print/acroread5/files/patch-aa
+++ b/print/acroread5/files/patch-aa
@@ -1,14 +1,5 @@
 --- INSTALL.orig	Thu Nov  7 00:04:53 1996
-+++ INSTALL	Sat Nov 16 15:30:26 1996
-@@ -67,7 +67,7 @@
-     exit 1
-   fi
- 
--  if [ -z "$PAGER" ] || [ "`type $PAGER`" = "$PAGER not found" ] ; then
-+  if [ -z "$PAGER" ] || [ "`$PAGER`" = "$PAGER not found" ] ; then
-     if [ "`type more`" != "more not found" ] ; then
-       command=more
-     elif [ "`type pg`" != "pg not found" ] ; then
++++ INSTALL	Wed Nov 20 17:37:14 1996
 @@ -117,6 +117,8 @@
      if [ "$i" -a -f "$i" ] ; then
          if [ `uname -s` = "Linux" ] ; then
@@ -18,6 +9,15 @@
          else
            size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
          fi
+@@ -486,7 +488,7 @@
+   SearchPlatformTar="$3"
+   CustomPlatformTar="$4"
+ 
+-  OutputLicense "$ReadLicense"
++#  OutputLicense "$ReadLicense"
+   ReadLicense=""
+ 
+   PrintRequiredFree "$ReadTar" "$SearchTar" "$CustomTar" \
 @@ -559,7 +561,7 @@
    *) ScriptDirectory="$CurrentDirectory"/"$ScriptDirectory" ;;
  esac
diff --git a/print/acroread5/pkg-plist b/print/acroread5/pkg-plist
index 39a1f837aee9..219e01d920f2 100644
--- a/print/acroread5/pkg-plist
+++ b/print/acroread5/pkg-plist
@@ -45,3 +45,5 @@ Acrobat3/Reader/res/splashScreen21.xbm
 Acrobat3/Reader/res/splashScreen28.xpm
 Acrobat3/bin/acroread
 bin/acroread
+@exec echo "Be sure to read the license agreement in"
+@exec echo "%D/Acrobat3/Reader/License.pdf"