From owner-svn-ports-all@FreeBSD.ORG  Tue Apr 22 20:30:20 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7118D6E5;
 Tue, 22 Apr 2014 20:30:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 45A50184D;
 Tue, 22 Apr 2014 20:30:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3MKUKHE016648;
 Tue, 22 Apr 2014 20:30:20 GMT (envelope-from thierry@svn.freebsd.org)
Received: (from thierry@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MKUJsL016646;
 Tue, 22 Apr 2014 20:30:19 GMT (envelope-from thierry@svn.freebsd.org)
Message-Id: <201404222030.s3MKUJsL016646@svn.freebsd.org>
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Tue, 22 Apr 2014 20:30:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351882 - head/net-im/mercury
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2014 20:30:20 -0000

Author: thierry
Date: Tue Apr 22 20:30:19 2014
New Revision: 351882
URL: http://svnweb.freebsd.org/changeset/ports/351882
QAT: https://qat.redports.org/buildarchive/r351882/

Log:
  - Support staging;
  
  - Mark as deprecated.

Modified:
  head/net-im/mercury/Makefile
  head/net-im/mercury/pkg-plist

Modified: head/net-im/mercury/Makefile
==============================================================================
--- head/net-im/mercury/Makefile	Tue Apr 22 20:30:15 2014	(r351881)
+++ head/net-im/mercury/Makefile	Tue Apr 22 20:30:19 2014	(r351882)
@@ -19,9 +19,12 @@ COMMENT=	Java Based MSN client
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
 		jmfinit:${PORTSDIR}/java/jmf
 
+DEPRECATED=	MSN is dying and the domain mercury.im is down
+EXPIRATION_DATE=2014-05-31
+
 RCVER=		rc8a
 
-USES=		zip
+USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
@@ -32,7 +35,7 @@ SUB_FILES=	Mercury_Messenger
 SUB_LIST=	JAVA_VERSION="${JAVA_VERSION}" JMF_JARS="${JMF_JARS:S|$|.jar|}"
 
 LINSTDIR?=	share/Mercury
-INSTDIR=	${PREFIX}/${LINSTDIR}
+INSTDIR=	${STAGEDIR}${PREFIX}/${LINSTDIR}
 PLIST_SUB=	INSTDIR=${LINSTDIR}
 SUB_DIRS=	lib resources
 DIR2PRUNE=	resources/AppData/Games		\
@@ -40,7 +43,7 @@ DIR2PRUNE=	resources/AppData/Games		\
 		resources/AppData/Skins
 
 DESKTOP_ENTRIES="Mercury Messenger" "${COMMENT}"	\
-		"${INSTDIR}/resources/online.png"	\
+		"${PREFIX}/${LINSTDIR}/resources/online.png"	\
 		"${SUB_FILES}"				\
 		"InstantMessaging;Java;Network;" true
 
@@ -53,7 +56,6 @@ PLIST_SUB+=	VID="" VIDJAR="${VIDJAR}"
 PLIST_SUB+=	VID="@comment " VIDJAR=""
 .endif
 
-NO_STAGE=	yes
 post-extract:
 	${MKDIR} ${WRKDIR}/icons
 	cd ${WRKDIR}/icons &&	\
@@ -61,8 +63,7 @@ post-extract:
 
 do-install:
 	${MKDIR} ${INSTDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${INSTDIR}
-	${LN} -sf ${INSTDIR}/${SUB_FILES} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${STAGEDIR}${PREFIX}/bin/
 .for sd in ${SUB_DIRS}
 	cd ${WRKDIR} && ${FIND} ${sd} -type d -exec ${MKDIR} ${INSTDIR}/{} \;
 	cd ${WRKDIR} && ${FIND} ${sd} -type f -exec ${INSTALL_DATA} {} ${INSTDIR}/{} \;

Modified: head/net-im/mercury/pkg-plist
==============================================================================
--- head/net-im/mercury/pkg-plist	Tue Apr 22 20:30:15 2014	(r351881)
+++ head/net-im/mercury/pkg-plist	Tue Apr 22 20:30:19 2014	(r351882)
@@ -1,5 +1,4 @@
 bin/Mercury_Messenger
-%%INSTDIR%%/Mercury_Messenger
 %%INSTDIR%%/lib/dMSN.jar
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN7.zip
 %%INSTDIR%%/resources/AppData/Games/.keep_me