[SVN-Commit] r278 - 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 18:07:38 2010
New Revision: 278

Log:
- Fix installation of Seamonkey 2 localization packs
- Bump PORTREVISIONs

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 14:45:08 2010	(r277)
+++ branches/experimental/www/seamonkey2-i18n/Makefile	Thu Feb 25 18:07:38 2010	(r278)
@@ -7,6 +7,7 @@
 
 PORTNAME=	seamonkey2-i18n
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -16,7 +17,7 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_XPI=	*seamonkey
+USE_XPI=	*seamonkey-2.0*
 
 USE_SUBMAKE=	yes
 

Modified: branches/experimental/www/seamonkey2/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2/Makefile	Thu Feb 25 14:45:08 2010	(r277)
+++ branches/experimental/www/seamonkey2/Makefile	Thu Feb 25 18:07:38 2010	(r278)
@@ -7,6 +7,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -32,6 +33,8 @@
 
 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 \
@@ -145,12 +148,6 @@
 		< ${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 14:45:08 2010	(r277)
+++ trunk/www/seamonkey2-i18n/Makefile	Thu Feb 25 18:07:38 2010	(r278)
@@ -7,6 +7,7 @@
 
 PORTNAME=	seamonkey2-i18n
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -16,7 +17,7 @@
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Localized interface for SeaMonkey 2
 
-USE_XPI=	*seamonkey
+USE_XPI=	*seamonkey-2.0*
 
 USE_SUBMAKE=	yes
 

Modified: trunk/www/seamonkey2/Makefile
==============================================================================
--- trunk/www/seamonkey2/Makefile	Thu Feb 25 14:45:08 2010	(r277)
+++ trunk/www/seamonkey2/Makefile	Thu Feb 25 18:07:38 2010	(r278)
@@ -7,6 +7,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -32,6 +33,8 @@
 
 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 \
@@ -145,12 +148,6 @@
 		< ${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}