1 files changed, 18 insertions, 9 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index cf6cc7f13009..f7685abca3f9 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.7.2
-PORTREVISION?=	2
+PORTREVISION?=	5
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -53,7 +53,7 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
 		--disable-auto-deps		\
 		--enable-chrome-format=jar	\
@@ -80,6 +80,7 @@ CONFIGURE_ARGS=					\
 		--with-system-mng=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
 		--with-gssapi=/usr		\
+		--prefix=${FAKEDIR}		\
 		--with-pthreads
 
 PLIST=		${WRKDIR}/pkg-plist
@@ -183,6 +184,7 @@ CONFIGURE_ARGS+=	--disable-composer
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
+FAKEDIR=	${WRKDIR}/fake
 
 #.if ${ARCH} == "i386"
 #CONFIGURE_ARGS+=	--enable-reorder
@@ -266,11 +268,9 @@ pre-configure:
 post-build:
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
 		${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA}
-	${FIND} ${WRKSRC}/dist/bin -type d | ${SORT} -r | \
-		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
 pre-install:
-	${RM} -f ${PLIST}
+	${RM} -rf ${PLIST} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
 	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
 		${ECHO_CMD} bin/mozilla >> ${PLIST} ; \
@@ -287,7 +287,9 @@ pre-install:
 		done; \
 		${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \
 	fi
-	cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \
+	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
+	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
+	cd ${FAKEDIR}/lib/mozilla && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \
 			&& ${FIND} -d * -type d | \
 			${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
@@ -295,7 +297,7 @@ pre-install:
 	for pcfile in ${PKGCONFIG_FILES}; do \
 		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
 	done
-	cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \
+	cd ${FAKEDIR}/include/mozilla && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST}
@@ -304,7 +306,12 @@ pre-install:
 do-install:
 	${MKDIR} ${PREFIX}/lib/${MOZILLA}
 	${CHMOD} 755 ${PREFIX}/lib/${MOZILLA}
-	cd ${WRKSRC}/dist/bin && ${FIND} . | \
+	${INSTALL_SCRIPT} ${FAKEDIR}/lib/mozilla ${PREFIX}/lib/${MOZILLA}
+	${INSTALL_SCRIPT} ${FAKEDIR}/lib/mozilla-config ${PREFIX}/lib/${MOZILLA}
+	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
+		${PREFIX}/lib/${MOZILLA}/mozilla \
+		${PREFIX}/lib/${MOZILLA}/mozilla-config
+	cd ${FAKEDIR}/lib/mozilla && ${FIND} . | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA}
 	${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin
 	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
@@ -323,13 +330,15 @@ do-install:
 		done; \
 	fi
 	for pcfile in ${PKGCONFIG_FILES}; do \
+		${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
+			${WRKSRC}/build/unix/$${pcfile}.pc; \
 		${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
 			${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
 	done
 	-${RM} -fr ${PREFIX}/include/${MOZILLA}
 	${MKDIR} ${PREFIX}/include/${MOZILLA}
 	${CHMOD} 755 ${PREFIX}/include/${MOZILLA}
-	cd ${WRKSRC}/dist/include && ${FIND} . | \
+	cd ${FAKEDIR}/include/mozilla && ${FIND} . | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA}
 
 post-install: