3 files changed, 36 insertions, 25 deletions

diff --git a/devel/ioncube/Makefile b/devel/ioncube/Makefile
index 94ea8017a727..7c344859b5cf 100644
--- a/devel/ioncube/Makefile
+++ b/devel/ioncube/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	ioncube
 DISTVERSION=	3.3.12
+PORTREVISION=	1	# 20100405
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads2.ioncube.com/loader_downloads/ \
-		http://downloads.ioncube.com/loader_downloads/
+		http://dl.dropbox.com/u/4211495/ioncube/
 DISTFILES=	${PORTNAME}_loaders_fre_${VER}_${ARCH_DIST}${EXTRACT_SUFX}
 
 MAINTAINER=	svyatoslav.lempert@gmail.com
@@ -20,22 +21,28 @@ NO_BUILD=	yes
 USE_PHP=	yes
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700055
-VER=		6
-.else
+# Detect Version: for FreeBSD 8.x i386 install 8.x build, else using build for FreeBSD 7.x
+.if ${OSVERSION} >= 800000 && ${ARCH} == i386
+VER=		8
+.endif
+.if (${OSVERSION} >= 700000 && ${OSVERSION} < 800000) || (${OSVERSION} >= 700000 && ${ARCH} == amd64)
 VER=		7
 .endif
+.if ${OSVERSION} < 700000
+VER=		6
+.endif
 
-.if ${ARCH} == i386
-ARCH_DIST=	x86
-.else
+# Detect OS Architecture
+.if ${ARCH} == amd64
 ARCH_DIST=	x86-64
+.else
+ARCH_DIST=	x86
 .endif
 
+# Detect PHP version
 .if ${PHP_VER} >= 5
 PHP_INSTVER=	5.2
 .else
diff --git a/devel/ioncube/distinfo b/devel/ioncube/distinfo
index 1a2144d18e75..a0264b66a597 100644
--- a/devel/ioncube/distinfo
+++ b/devel/ioncube/distinfo
@@ -1,14 +1,15 @@
-SIZE (ioncube_loaders_fre_6_x86.tar.gz) = 2770639
-MD5 (ioncube_loaders_fre_6_x86.tar.gz) = b4f85f6c4b5ed66ff50443d4f8597d1c
-SHA256 (ioncube_loaders_fre_6_x86.tar.gz) = a351cab3163659f6a8378507f73c2fef47a6fecf7ec720b2338ad60c644b910f
-SIZE (ioncube_loaders_fre_6_x86-64.tar.gz) = 2681199
-MD5 (ioncube_loaders_fre_6_x86-64.tar.gz) = c2fd49757d0463bd73a967644f9b6030
-SHA256 (ioncube_loaders_fre_6_x86-64.tar.gz) = 07c0586c11a13ac3e7cd780c1d5a09a04c5de5b0a05efc8d0d472fb32c7115e7
-SIZE (ioncube_loaders_fre_7_x86.tar.gz) = 2770639
-MD5 (ioncube_loaders_fre_7_x86.tar.gz) = abce967b6087ffa13da438a12e9507db
-SHA256 (ioncube_loaders_fre_7_x86.tar.gz) = 742e05a8166aad681e0c4aafaf140d09075bb4859e352d109ed7c5d55943f90c
-SIZE (ioncube_loaders_fre_7_x86-64.tar.gz) = 2681199
-MD5 (ioncube_loaders_fre_7_x86-64.tar.gz) = b4f85f6c4b5ed66ff50443d4f8597d1c
-SHA256 (ioncube_loaders_fre_7_x86-64.tar.gz) = 3b54452a64fe73968f98274769d0461808549a935cca2c322ffd937c3f2403ae
-MD5 (ioncube_loaders_fre_7_x86-64.tar.gz) = 2c9558e9624e323be2b737794ee634e6
-SHA256 (ioncube_loaders_fre_7_x86-64.tar.gz) = 3b54452a64fe73968f98274769d0461808549a935cca2c322ffd937c3f2403ae
+MD5 (ioncube_loaders_fre_6_x86.tar.gz) = c0edbdefb3da35271bb8b4adcc86caa0
+SHA256 (ioncube_loaders_fre_6_x86.tar.gz) = aa4926f55da33973dc85edc00e965e1969c59c4055d485ac6306816d2b926cbc
+SIZE (ioncube_loaders_fre_6_x86.tar.gz) = 2770640
+MD5 (ioncube_loaders_fre_6_x86-64.tar.gz) = 30775c3b17c7e624b0fed65b919b87f5
+SHA256 (ioncube_loaders_fre_6_x86-64.tar.gz) = 34d15c369cc6e34c9d50fcc1eaf5e36be03e349065f6d41d2858e3b928212c71
+SIZE (ioncube_loaders_fre_6_x86-64.tar.gz) = 2296844
+MD5 (ioncube_loaders_fre_7_x86.tar.gz) = bb1762653395b08e562d2ab403d122f5
+SHA256 (ioncube_loaders_fre_7_x86.tar.gz) = e2786dd6af9b1c16a68b4c3743a0bef04625649cb762bfb758a0204a9031e300
+SIZE (ioncube_loaders_fre_7_x86.tar.gz) = 2527675
+MD5 (ioncube_loaders_fre_7_x86-64.tar.gz) = 0edfb3a2aba9aa4c6adfb7e246c98eea
+SHA256 (ioncube_loaders_fre_7_x86-64.tar.gz) = 1c47e6ae8ce55e175f52a6587f52b8ee3fd4af483a8424201f06fc012696c54f
+SIZE (ioncube_loaders_fre_7_x86-64.tar.gz) = 2681484
+MD5 (ioncube_loaders_fre_8_x86.tar.gz) = 332220e897b9db25834e5248725ea79f
+SHA256 (ioncube_loaders_fre_8_x86.tar.gz) = a5254c96aefa523beaad63b5a573e7683690ddcb0fd14cf75f214cfb79899323
+SIZE (ioncube_loaders_fre_8_x86.tar.gz) = 2528903
diff --git a/devel/ioncube/files/pkg-message.in b/devel/ioncube/files/pkg-message.in
index ba6348728feb..5bb7f4f2bd2d 100644
--- a/devel/ioncube/files/pkg-message.in
+++ b/devel/ioncube/files/pkg-message.in
@@ -1,11 +1,14 @@
-********************************************************************************
 
 You have installed the ionCube loader package.
 
-Edit %%LOCALBASE%%/etc/php.ini and add:
+Edit %%LOCALBASE%%/etc/php.ini or %%LOCALBASE%%/etc/php/extensions.ini
+and add this three lines:
 
+--------------------------------------------------------------------------------
 [Zend]
 zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so"
 zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so"
+--------------------------------------------------------------------------------
 
-********************************************************************************
+NOTE: If you have any Zend Extension already installed - you need put this before
+existing zend_extension lines.