- Upgraded to 1.2.4

- Switched back to using devel/pear pear-deinstall script, since local one
  is overwritten during install phase anyway
- Changed location of pear script in pear-install to LOCALBASE, so it can
  be located during installation to non-standard PREFIX

4 files changed, 8 insertions, 37 deletions

diff --git a/databases/pear-Doctrine12/Makefile b/databases/pear-Doctrine12/Makefile
index ea98db661a0f..c7458fa42487 100644
--- a/databases/pear-Doctrine12/Makefile
+++ b/databases/pear-Doctrine12/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	Doctrine
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	databases pear
-MASTER_SITES=	http://pear.phpdoctrine.org/get/ \
+MASTER_SITES=	http://www.doctrine-project.org/downloads/ \
 		LOCAL/glarkin
 PORTSCOUT=	limit:^1\.2\.
 
@@ -21,14 +21,12 @@ OPTIONS=	DBLIB "Install PHP DBO driver for DBLIB" Off \
 		PGSQL "Install PHP DBO driver for PostgreSQL" Off \
 		SQLITE "Install PHP DBO driver for SQLite" Off
 
-CATEGORY=	${PORTNAME}
 CHANNEL=	pear.doctrine-project.org
 MANUAL_PACKAGE_BUILD=	attempts to contact ${CHANNEL} during installation
 
-SUB_FILES=	pear-deinstall pear-install
-SUB_LIST+=	CHANNEL=${CHANNEL}
+SUB_FILES=	pear-install
+SUB_LIST+=	CHANNEL=${CHANNEL} LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pear-install
-PKGDEINSTALL=	${WRKDIR}/pear-deinstall
 LATEST_LINK=	pear-Doctrine12
 
 LICENSE=	GPLv2
diff --git a/databases/pear-Doctrine12/distinfo b/databases/pear-Doctrine12/distinfo
index a5eb946172eb..c01e67b5afaf 100644
--- a/databases/pear-Doctrine12/distinfo
+++ b/databases/pear-Doctrine12/distinfo
@@ -1,2 +1,2 @@
-SHA256 (PEAR/Doctrine-1.2.3.tgz) = 3b9e8af1bd255ce155edf5b211a277c23cc01cf79925c3df63f61a1230802e55
-SIZE (PEAR/Doctrine-1.2.3.tgz) = 377480
+SHA256 (PEAR/Doctrine-1.2.4.tgz) = 83d32004c65f7f4cf5961a22e7489f0dd81b81516bb21fe5dbe732047fe01a3e
+SIZE (PEAR/Doctrine-1.2.4.tgz) = 377121
diff --git a/databases/pear-Doctrine12/files/pear-deinstall.in b/databases/pear-Doctrine12/files/pear-deinstall.in
deleted file mode 100644
index ccbf7b82cb25..000000000000
--- a/databases/pear-Doctrine12/files/pear-deinstall.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry and optionally delete
-# a non-standard channel.
-
-if [ x$2 != xDEINSTALL -a x$2 != xPOST-DEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-PEAR=${PKG_PREFIX}/bin/pear
-CHANNEL=%%CHANNEL%%
-
-if [ "$2" = "DEINSTALL" ]; then
-	if [ "x${CHANNEL}" != "x" ]; then
-		${PEAR} uninstall -r -n ${CHANNEL}/${PACKAGE} || true
-	else
-		${PEAR} uninstall -r -n ${PACKAGE} || true
-	fi
-else
-	if [ "x${CHANNEL}" != "x" ]; then
-		${PEAR} channel-delete ${CHANNEL}
-	fi
-fi
diff --git a/databases/pear-Doctrine12/files/pear-install.in b/databases/pear-Doctrine12/files/pear-install.in
index 2ec01250b2f3..52d50417d9c3 100644
--- a/databases/pear-Doctrine12/files/pear-install.in
+++ b/databases/pear-Doctrine12/files/pear-install.in
@@ -5,8 +5,8 @@
 # Register the package $1 in the port registry and optionally add a
 # non-standard channel.
 
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-PEAR=${PREFIX}/bin/pear
+PREFIX=${PKG_PREFIX:=%%LOCALBASE%%}
+PEAR=%%LOCALBASE%%/bin/pear
 PKGREGDIR=${PREFIX}/share/pear/packages/$1
 CHANNEL=%%CHANNEL%%