-- Marge lots of common mozilla-ports tasks into Makefile.common

  o creation of plist (Disabled with NOGECKO_PLIST)
  o install (Disabled with NOGECKO_INSTALL)
  o many common post-patch routines
- Expand post- pre- targets so ports and Makefile.common can use the same
  target
- Makefile.common supports both ${FILESDIR}/mozconfig.in (if exists) and
  now has 3 new variables to add opions to .mozconfig [1]

Ports can use the following:

 NOGECKO_INSTALL
 NOGECKO_PLIST         Do not auto-create plist
 NOMOZCONFIG           Use CONFIGURE_ARGS instead of .mozconfig

 MOZILLA_PLIST_DIRS    Listing of directories to create plist and/or
                        install
 MOZ_PIS_SCRIPTS       List scripts listed in ${FILESDIR} to filter
                        through MOZCONFIG_SED and install with mozilla
                        PIS scripts.
 MOZ_SED_ARGS          Add or replace to MOZ_SED_ARGS

[1]
 MOZ_OPTIONS           Add more configure arguments to .mozconfig
 MOZ_MK_OPTIONS        Add more make arguments to .mozconfig
 MOZ_EXPORT            Add export variables to .mozconfig

 if ${FILESDIR}/mozconfig.in exists and NOMOZCONFIG is not defined
 contents of ${FILESDIR}/mozconfig.in will be filtered through MOZCONFIG_SED
 and added the the end of .mozconfig

I broke the following:
 o Optional extensions (irc, etc) , need to figure out how to handle this

Todo:
 o Handle .desktop the install of .desktop files and icons
 o Handle Java plugins
 o Cleanup/Audit and moving any other common "things" into Makefile.common
 o (maybe) convert all the ${FILESDIR}/mozconfig.in to MOZ_OPTIONS/EXPORT
   variables
 o Add support for ports to set MOZILLA=PORTNAME-devel
 o Figure out how to get the rest of mozconfig-generic.in to work in
   MOZ_EXPORT, the following example does not work

        MOZ_EXPORT=CFLAGS="${CFLAGS}"

        if treats each flag in CFLAGS as a different flag and you end
        up with a bunch of export -O2, export -xxx instead of
        export -O2 -xxx -blah ....
 o Figure out why MOZ_OPIONS+=--prefix=${FAKEDIR} ends up in
   .mozconfig as --prefix=/fake instead of --prefix=${WRKDIR}/fake
   (--prefix is in mozconfig-generic.in for now)
 o testing testing TESTING


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5182 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 7 insertions, 92 deletions

diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index feb3b9c3a..0b239ac34 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/Makefile,v 1.10 2005/11/14 04:12:06 ahze Exp $
+#   $MCom: ports/deskutils/sunbird/Makefile,v 1.11 2005/11/18 08:46:49 ahze Exp $
 #
 
 PORTNAME=	sunbird
@@ -35,22 +35,11 @@ SUNBIRD_ICON=		${PORTNAME}.xpm
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
 	@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
 		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 		embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
@@ -59,57 +48,14 @@ post-patch:
 .endfor
 
 pre-install:
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}' >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-		${FAKEDIR}/bin/sunbird \
-		${FAKEDIR}/bin/sunbird-config
-	${ECHO_CMD} bin/sunbird >> ${PLIST}
-	${ECHO_CMD} bin/sunbird-config >> ${PLIST}
-	cd ${FAKEDIR}/lib/${SUNBIRD} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${SUNBIRD}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${SUNBIRD}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${SUNBIRD} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${SUNBIRD} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${SUNBIRD}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${SUNBIRD}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${SUNBIRD} >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${SUNBIRD}
-	${CHMOD} 755 ${PREFIX}/lib/${SUNBIRD}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/sunbird ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/sunbird-config ${PREFIX}/bin
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${SUNBIRD}
-	${MKDIR} ${PREFIX}/include/${SUNBIRD}
-	${CHMOD} 755 ${PREFIX}/include/${SUNBIRD}
-	cd ${FAKEDIR}/include/${SUNBIRD} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${SUNBIRD}
-	cd ${FAKEDIR}/lib/${SUNBIRD} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${SUNBIRD}
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
 	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
 
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/deskutils/sunbird/files/patch-config_autoconf.mk.in b/deskutils/sunbird/files/patch-config_autoconf.mk.in
index 03f541a43..c4fa0b516 100644
--- a/deskutils/sunbird/files/patch-config_autoconf.mk.in
+++ b/deskutils/sunbird/files/patch-config_autoconf.mk.in
@@ -5,14 +5,14 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
 -includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)
++includedir	= @includedir@/%%MOZILLA%%
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
  idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
 -mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/$(MOZ_APP_NAME)
++mozappdir	= $(libdir)/%%MOZILLA%%
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
diff --git a/deskutils/sunbird/pkg-deinstall.in b/deskutils/sunbird/pkg-deinstall.in
index d9f55ec2e..a7bfeb72b 100644
--- a/deskutils/sunbird/pkg-deinstall.in
+++ b/deskutils/sunbird/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#    $MCom$
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,14 +16,11 @@ PATH=/bin:/usr/bin
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
+rm -rf ${MOZDIR}/extensions
+rm -rf ${MOZDIR}/updates
 rm -f ${MOZDIR}/chrome/app-chrome.manifest
+rm -f ${MOZDIR}/chrome/*.rdf
 rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
 rm -f ${MOZDIR}/components/*.dat
-rm -rf ${MOZDIR}/extensions
-rm -rf ${MOZDIR}/updates
-rm -f ${MOZDIR}/extensions.ini
 
 exit 0
diff --git a/deskutils/sunbird/pkg-install.in b/deskutils/sunbird/pkg-install.in
deleted file mode 100644
index 88bd2fcc4..000000000
--- a/deskutils/sunbird/pkg-install.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/pkg-install.in,v 1.4 2005/06/28 05:39:59 adamw Exp $
-#
-# Date created:			Mon Nov 29, 2003
-# Whom:				Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin:/usr/local/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-REGXPCOM=${MOZDIR}/regxpcom
-SUNBIRD=${MOZDIR}/sunbird-bin
-
-echo "===> Building Chrome's registry..."
-
-cd ${MOZDIR} || exit 1
-./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${SUNBIRD} -register > /dev/null 2>&1
-
-touch -f ${MOZDIR}/chrome/user-skins.rdf ${MOZDIR}/chrome/user-locales.rdf
-
-exit 0