The calendar module is broken in this 1.8 beta, so disable it.

PR:		84578
This commit is contained in:
Joe Marcus Clarke 2005-09-02 05:17:56 +00:00
parent fde840579a
commit 5573f02872
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=141759
3 changed files with 24 additions and 27 deletions

View file

@ -95,8 +95,7 @@ JPI_LIST?=\
${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
MAILNEWS "Enable Mail and News modules" on \
COMPOSER "Enable the HTML Composer module" on \ COMPOSER "Enable the HTML Composer module" on \
DEBUG "Enable debugging (i.e. gdb) support" off \ DEBUG "Enable debugging (i.e. gdb) support" off \
LDAP "Enable LDAP support for Mailnews" on \ LDAP "Enable LDAP support for Mailnews" on \
@ -122,10 +121,10 @@ BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
illegibly. Please remove the mozilla-fonts package illegibly. Please remove the mozilla-fonts package
.endif .endif
.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ #.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
defined(WITHOUT_COMPOSER)) # defined(WITHOUT_COMPOSER))
BROKEN= Calendar requires Composer and Mailnews support. #BROKEN= Calendar requires Composer and Mailnews support.
.endif #.endif
.if ${OSVERSION} < 500000 .if ${OSVERSION} < 500000
USE_GCC= 3.4 USE_GCC= 3.4
@ -183,9 +182,9 @@ CONFIGURE_ARGS+= --disable-jsd \
--disable-dtd-debug --disable-dtd-debug
.endif .endif
.if defined(WITH_CALENDAR) #.if defined(WITH_CALENDAR)
CONFIGURE_ARGS+= --enable-calendar #CONFIGURE_ARGS+= --enable-calendar
.endif #.endif
.if defined(WITHOUT_COMPOSER) .if defined(WITHOUT_COMPOSER)
CONFIGURE_ARGS+= --disable-composer CONFIGURE_ARGS+= --disable-composer

View file

@ -95,8 +95,7 @@ JPI_LIST?=\
${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
MAILNEWS "Enable Mail and News modules" on \
COMPOSER "Enable the HTML Composer module" on \ COMPOSER "Enable the HTML Composer module" on \
DEBUG "Enable debugging (i.e. gdb) support" off \ DEBUG "Enable debugging (i.e. gdb) support" off \
LDAP "Enable LDAP support for Mailnews" on \ LDAP "Enable LDAP support for Mailnews" on \
@ -122,10 +121,10 @@ BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
illegibly. Please remove the mozilla-fonts package illegibly. Please remove the mozilla-fonts package
.endif .endif
.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ #.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
defined(WITHOUT_COMPOSER)) # defined(WITHOUT_COMPOSER))
BROKEN= Calendar requires Composer and Mailnews support. #BROKEN= Calendar requires Composer and Mailnews support.
.endif #.endif
.if ${OSVERSION} < 500000 .if ${OSVERSION} < 500000
USE_GCC= 3.4 USE_GCC= 3.4
@ -183,9 +182,9 @@ CONFIGURE_ARGS+= --disable-jsd \
--disable-dtd-debug --disable-dtd-debug
.endif .endif
.if defined(WITH_CALENDAR) #.if defined(WITH_CALENDAR)
CONFIGURE_ARGS+= --enable-calendar #CONFIGURE_ARGS+= --enable-calendar
.endif #.endif
.if defined(WITHOUT_COMPOSER) .if defined(WITHOUT_COMPOSER)
CONFIGURE_ARGS+= --disable-composer CONFIGURE_ARGS+= --disable-composer

View file

@ -95,8 +95,7 @@ JPI_LIST?=\
${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
MAILNEWS "Enable Mail and News modules" on \
COMPOSER "Enable the HTML Composer module" on \ COMPOSER "Enable the HTML Composer module" on \
DEBUG "Enable debugging (i.e. gdb) support" off \ DEBUG "Enable debugging (i.e. gdb) support" off \
LDAP "Enable LDAP support for Mailnews" on \ LDAP "Enable LDAP support for Mailnews" on \
@ -122,10 +121,10 @@ BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
illegibly. Please remove the mozilla-fonts package illegibly. Please remove the mozilla-fonts package
.endif .endif
.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ #.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
defined(WITHOUT_COMPOSER)) # defined(WITHOUT_COMPOSER))
BROKEN= Calendar requires Composer and Mailnews support. #BROKEN= Calendar requires Composer and Mailnews support.
.endif #.endif
.if ${OSVERSION} < 500000 .if ${OSVERSION} < 500000
USE_GCC= 3.4 USE_GCC= 3.4
@ -183,9 +182,9 @@ CONFIGURE_ARGS+= --disable-jsd \
--disable-dtd-debug --disable-dtd-debug
.endif .endif
.if defined(WITH_CALENDAR) #.if defined(WITH_CALENDAR)
CONFIGURE_ARGS+= --enable-calendar #CONFIGURE_ARGS+= --enable-calendar
.endif #.endif
.if defined(WITHOUT_COMPOSER) .if defined(WITHOUT_COMPOSER)
CONFIGURE_ARGS+= --disable-composer CONFIGURE_ARGS+= --disable-composer