From 9e68f12215b1756d5437d006754381092eec42e4 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 3 Aug 2005 15:22:28 +0000
Subject: Fix some more problems with IDL installation.

PR:		84514
Submitted by:	chinsan <chinsan.tw@gmail.com>
Approved by:	portmgr (implicit)
---
 www/mozilla-devel/Makefile | 6 +++---
 www/seamonkey/Makefile     | 6 +++---
 www/seamonkey2/Makefile    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'www')

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 8aa77dc116b8..3bc4f5640d76 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MOZILLA?=	mozilla-devel
 MOZ_SUFX?=	-devel
-MOZ_VER?=	${PORTVERSION:S/.b1/b1/}
+MOZ_VER?=	${PORTVERSION:S/.b1/b/}
 LATEST_LINK=	${MOZILLA}
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -306,7 +306,7 @@ pre-install:
 	${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST}
 	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \
 		&& ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -353,7 +353,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \
 		${PREFIX}/share/applications
 	${MKDIR} ${PREFIX}/share/idl/${MOZILLA}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} && ${FIND} . | \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA}
 
 post-install:
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 8aa77dc116b8..3bc4f5640d76 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MOZILLA?=	mozilla-devel
 MOZ_SUFX?=	-devel
-MOZ_VER?=	${PORTVERSION:S/.b1/b1/}
+MOZ_VER?=	${PORTVERSION:S/.b1/b/}
 LATEST_LINK=	${MOZILLA}
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -306,7 +306,7 @@ pre-install:
 	${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST}
 	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \
 		&& ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -353,7 +353,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \
 		${PREFIX}/share/applications
 	${MKDIR} ${PREFIX}/share/idl/${MOZILLA}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} && ${FIND} . | \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA}
 
 post-install:
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 8aa77dc116b8..3bc4f5640d76 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MOZILLA?=	mozilla-devel
 MOZ_SUFX?=	-devel
-MOZ_VER?=	${PORTVERSION:S/.b1/b1/}
+MOZ_VER?=	${PORTVERSION:S/.b1/b/}
 LATEST_LINK=	${MOZILLA}
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -306,7 +306,7 @@ pre-install:
 	${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST}
 	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \
 		&& ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
@@ -353,7 +353,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \
 		${PREFIX}/share/applications
 	${MKDIR} ${PREFIX}/share/idl/${MOZILLA}
-	cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} && ${FIND} . | \
+	cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA}
 
 post-install:
-- 
cgit v1.2.3