Date: Mon, 13 Sep 2010 10:04:56 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r394 - branches/experimental/www/seamonkey2-i18n trunk/www/seamonkey2-i18n Message-ID: <201009131004.o8DA4unH070748@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Sep 13 10:04:56 2010
New Revision: 394
Log:
- Add the ability to create customized packages on tinderbox (i.e. honour
OPTIONSFILE).
Submitted by: ale
Modified:
branches/experimental/www/seamonkey2-i18n/Makefile
branches/experimental/www/seamonkey2-i18n/Makefile.lang
trunk/www/seamonkey2-i18n/Makefile
trunk/www/seamonkey2-i18n/Makefile.lang
Modified: branches/experimental/www/seamonkey2-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-i18n/Makefile Fri Sep 10 15:59:45 2010 (r393)
+++ branches/experimental/www/seamonkey2-i18n/Makefile Mon Sep 13 10:04:56 2010 (r394)
@@ -2,7 +2,7 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.10 2010/09/10 15:53:41 ale Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.11 2010/09/13 10:00:57 ale Exp $
#
PORTNAME= seamonkey2-i18n
@@ -25,13 +25,12 @@
XPI_DISTNAMES= ${SEAMONKEY_I18N_}
-.include "${.CURDIR}/Makefile.option"
-.include <bsd.port.pre.mk>
-
.ifndef WITHOUT_SWITCHER
RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
.endif
+.include "${.CURDIR}/Makefile.option"
+.include <bsd.port.options.mk>
.include "${.CURDIR}/Makefile.lang"
SEAMONKEY_I18N_?= ${SEAMONKEY_I18N}
@@ -56,10 +55,6 @@
fi \
done
-.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
-pre-configure: config
-.endif
-
do-install:
@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
@${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
@@ -84,4 +79,4 @@
.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: branches/experimental/www/seamonkey2-i18n/Makefile.lang
==============================================================================
--- branches/experimental/www/seamonkey2-i18n/Makefile.lang Fri Sep 10 15:59:45 2010 (r393)
+++ branches/experimental/www/seamonkey2-i18n/Makefile.lang Mon Sep 13 10:04:56 2010 (r394)
@@ -2,14 +2,14 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile.lang,v 1.2 2010/09/10 15:53:41 ale Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile.lang,v 1.3 2010/09/13 10:00:57 ale Exp $
#
# Currently, the following 19 languages are supported.
#
SEAMONKEY_I18N_ALL_= be ca cs de es-AR es-ES fr gl hu it \
ka lt nb-NO nl pl pt-PT ru sk tr
-.if defined(SEAMONKEY_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
+.if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum)
SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_}
.else
.ifndef WITHOUT_LANG_BE
Modified: trunk/www/seamonkey2-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey2-i18n/Makefile Fri Sep 10 15:59:45 2010 (r393)
+++ trunk/www/seamonkey2-i18n/Makefile Mon Sep 13 10:04:56 2010 (r394)
@@ -2,7 +2,7 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.10 2010/09/10 15:53:41 ale Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile,v 1.11 2010/09/13 10:00:57 ale Exp $
#
PORTNAME= seamonkey2-i18n
@@ -25,13 +25,12 @@
XPI_DISTNAMES= ${SEAMONKEY_I18N_}
-.include "${.CURDIR}/Makefile.option"
-.include <bsd.port.pre.mk>
-
.ifndef WITHOUT_SWITCHER
RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
.endif
+.include "${.CURDIR}/Makefile.option"
+.include <bsd.port.options.mk>
.include "${.CURDIR}/Makefile.lang"
SEAMONKEY_I18N_?= ${SEAMONKEY_I18N}
@@ -56,10 +55,6 @@
fi \
done
-.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
-pre-configure: config
-.endif
-
do-install:
@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
@${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
@@ -84,4 +79,4 @@
.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/www/seamonkey2-i18n/Makefile.lang
==============================================================================
--- trunk/www/seamonkey2-i18n/Makefile.lang Fri Sep 10 15:59:45 2010 (r393)
+++ trunk/www/seamonkey2-i18n/Makefile.lang Mon Sep 13 10:04:56 2010 (r394)
@@ -2,14 +2,14 @@
# Date created: 30 Nov 2008
# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
#
-# $FreeBSD: ports/www/seamonkey2-i18n/Makefile.lang,v 1.2 2010/09/10 15:53:41 ale Exp $
+# $FreeBSD: ports/www/seamonkey2-i18n/Makefile.lang,v 1.3 2010/09/13 10:00:57 ale Exp $
#
# Currently, the following 19 languages are supported.
#
SEAMONKEY_I18N_ALL_= be ca cs de es-AR es-ES fr gl hu it \
ka lt nb-NO nl pl pt-PT ru sk tr
-.if defined(SEAMONKEY_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
+.if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum)
SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_}
.else
.ifndef WITHOUT_LANG_BE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009131004.o8DA4unH070748>