[SVN-Commit] r280 - branches/experimental/www/seamonkey2 branches/experimental/www/seamonkey2-i18n trunk/www/seamonkey2 trunk/www/seamonkey2-i18n

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Thu Feb 25 19:53:48 2010
New Revision: 280

Log:
- Revert revision 278 as revision 279 fixes installation already. We may
  should consider this change for future updates of Seamonkey 2 but I don't
  like to change this during the feature freeze.

Modified:
   branches/experimental/www/seamonkey2-i18n/Makefile
   branches/experimental/www/seamonkey2/Makefile
   trunk/www/seamonkey2-i18n/Makefile
   trunk/www/seamonkey2/Makefile

Modified: branches/experimental/www/seamonkey2-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-i18n/Makefile	Thu Feb 25 19:06:06 2010	(r279)
+++ branches/experimental/www/seamonkey2-i18n/Makefile	Thu Feb 25 19:53:48 2010	(r280)
@@ -2,7 +2,7 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.2 2009/12/21 19:10:05 beat Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.4 2010/02/18 10:27:20 beat Exp $
 #
 
 PORTNAME=	seamonkey2-i18n
@@ -17,7 +17,7 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_XPI=	*seamonkey-2.0*
+USE_XPI=	*seamonkey
 
 USE_SUBMAKE=	yes
 

Modified: branches/experimental/www/seamonkey2/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2/Makefile	Thu Feb 25 19:06:06 2010	(r279)
+++ branches/experimental/www/seamonkey2/Makefile	Thu Feb 25 19:53:48 2010	(r280)
@@ -2,12 +2,11 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.302 2010/02/05 11:45:08 dinoex Exp $
+# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.303 2010/02/18 10:27:19 beat Exp $
 #
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.3
-PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -33,8 +32,6 @@
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
-MOZILLA=	${PORTNAME}-${PORTVERSION}
-MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
@@ -148,6 +145,12 @@
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
 
+port-pre-install:
+	@${REINPLACE_CMD} -e 's|seamonkey-${PORTVERSION}|seamonkey|' \
+		${FAKEDIR}/bin/seamonkey
+	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
+	${MV} ${FAKEDIR}/lib/seamonkey-${PORTVERSION} ${FAKEDIR}/lib/seamonkey
+
 pre-install:
 	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}

Modified: trunk/www/seamonkey2-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey2-i18n/Makefile	Thu Feb 25 19:06:06 2010	(r279)
+++ trunk/www/seamonkey2-i18n/Makefile	Thu Feb 25 19:53:48 2010	(r280)
@@ -2,7 +2,7 @@
 # Date created:		28 May 2006
 # Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
 #
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.2 2009/12/21 19:10:05 beat Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.4 2010/02/18 10:27:20 beat Exp $
 #
 
 PORTNAME=	seamonkey2-i18n
@@ -17,7 +17,7 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_XPI=	*seamonkey-2.0*
+USE_XPI=	*seamonkey
 
 USE_SUBMAKE=	yes
 

Modified: trunk/www/seamonkey2/Makefile
==============================================================================
--- trunk/www/seamonkey2/Makefile	Thu Feb 25 19:06:06 2010	(r279)
+++ trunk/www/seamonkey2/Makefile	Thu Feb 25 19:53:48 2010	(r280)
@@ -2,12 +2,11 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.302 2010/02/05 11:45:08 dinoex Exp $
+# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.303 2010/02/18 10:27:19 beat Exp $
 #
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.3
-PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -33,8 +32,6 @@
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
-MOZILLA=	${PORTNAME}-${PORTVERSION}
-MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
@@ -148,6 +145,12 @@
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
 
+port-pre-install:
+	@${REINPLACE_CMD} -e 's|seamonkey-${PORTVERSION}|seamonkey|' \
+		${FAKEDIR}/bin/seamonkey
+	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
+	${MV} ${FAKEDIR}/lib/seamonkey-${PORTVERSION} ${FAKEDIR}/lib/seamonkey
+
 pre-install:
 	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}