pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2007Q1]: pkgsrc/misc/openoffice2 Pullup ticket 2117 - requeste...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05104e1827cd
branches:  pkgsrc-2007Q1
changeset: 527432:05104e1827cd
user:      salo <salo%pkgsrc.org@localhost>
date:      Mon Jun 25 15:37:45 2007 +0000

description:
Pullup ticket 2117 - requested by lkundrak
security update for openoffice2

Updated via patch from hira, the MAINTAINER.

   Module Name:         pkgsrc
   Committed By:        hira
   Date:                Fri Jun 22 03:52:21 UTC 2007

   Modified Files:
        pkgsrc/misc/openoffice2: Makefile distinfo

   Log Message:
   Update to 2.2.1 during freeze because of security fixes (CVE-2007-0245
   and CVE-2007-2754).

   Changes from 2.2.0:
    * freetypettg: fix CVE-2007-2754 for the internal freetype copy
    * autotext02: A showstopper fix for OOo2.2.1
    * l10n77316fix: contains fix for i77316
    * notepaint: Fix for invisible text in Calc notes while editing
    * macosxpbuildrepair_OOF680:
      This cws fixes broken Mac OS X 10.3 build, and does contain :
        - a fix for a build breaker in slideshow ( fixed by thb ) #i74325#
        - gcc-3.3 parser fixes #i75990#
        - a complete fix in sal for security.c ( with sb help ) #i76159#
        - a fix for broken linking ( because of extra symbols, due to bad
          filtering ) #i72922#
        - a fix for main.applescript ( build borken on Panther ) #i75972#
      All issue targeted 2.2.1 ( supposing the changes will be integrated
      in SRC680 too)
    * ause078_OOF680: quick and small to get back correct dependencies
    * os95_OOF680,plthes: add license-fixed polish thesaurus
    * olenoserver: A fix for a regression.
    * hro15: Unicode command line support fix for Windows only.
    * custompropsfix: Small bug fix in Word import for import of document
                      variables
    * dba221b: fix issue 73722, in its incarnation as issue 76434, for 2.2.1.
    * swvalgrind: Fix for i76133
    * calc221: Calc fixes for OOo2.2.1
    * fix75967: fix issue 75967
    * c03v8,c07v012,native86,nativebroffice: New Product BrOffice.org
    * impress120: Bugfix workspace for OOo 2.2.1
        sj->wg: the performance test hasn|t been finished yet, but I think
           it should be no problem to hand over this issue without the test.
    * larsbehr01: Bugfix for i66661: Slideshow bug fixing for 2.2.1
    * dba221a: ongoing DBA-related bugfixing towards OOo 2.2.1
    * sch17: Fixes for sch
    * tbe29: OOo 2.2.1 accessibility bug fixes
    * impress119: Bug fixes for OOo 2.2.1.
    * printhelpfix: Bugfix for 134037.
    * autotext01: A showstopper cws related to autotext bug.
    * native79: Preparing OOo 2.2.1 and SO 8 Update 7
    * vcl73_OOF680: 2.2.1 issues
    * cmcfixes32_OOF680: minor customized build fixes
    * jl57_OOF680: Contains a patch for building with an older gcc compiler.
    * fsfixes06_OOF680: Fix for a bug in WordPerfect typedetection that caused
                        us to crash on unsupported documents instead of refusing
                        them with grace
    * jl62,oasisrng02: Fixes of violations of the RelaxNG schema in ODF.
    * aw050: OOo 2.2.1 BugFixing
    * swqbugfix01: Issues in Writer regarding saving of documents

diffstat:

 misc/openoffice2/MESSAGE          |  10 +++++
 misc/openoffice2/Makefile         |  76 ++++++++++++++++++++++----------------
 misc/openoffice2/distinfo         |  41 ++++++++++----------
 misc/openoffice2/options.mk       |  35 +++++++++--------
 misc/openoffice2/patches/patch-aj |  10 ++---
 misc/openoffice2/patches/patch-ak |  13 +++++-
 misc/openoffice2/patches/patch-ba |  13 +++++-
 misc/openoffice2/patches/patch-ch |  12 ++----
 misc/openoffice2/patches/patch-cn |  17 ++++++++
 9 files changed, 141 insertions(+), 86 deletions(-)

diffs (truncated from 452 to 300 lines):

diff -r 3450bebdd1e5 -r 05104e1827cd misc/openoffice2/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2/MESSAGE  Mon Jun 25 15:37:45 2007 +0000
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.2.2 2007/06/25 15:37:45 salo Exp $
+
+  OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}.
+
+  Before using this package for the first time, each user has to run
+  a setup program, which is automatically invoked at the first start.
+  Thereafter, OpenOffice can be started using the
+  ${PREFIX}/bin/soffice command.
+===========================================================================
diff -r 3450bebdd1e5 -r 05104e1827cd misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Sat Jun 23 23:32:30 2007 +0000
+++ b/misc/openoffice2/Makefile Mon Jun 25 15:37:45 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/04/05 23:24:01 hira Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2007/06/25 15:37:45 salo Exp $
 #
 
-OO_VER=                        2.2.0
+OO_VER=                        2.2.1
 DISTNAME=              openoffice-${OO_VER}
 PKGNAME=               openoffice2-${OO_VER}
 CATEGORIES=            misc
@@ -28,7 +28,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-WRKSRC=                        ${WRKDIR}/OOF680_m14
+WRKSRC=                        ${WRKDIR}/OOF680_m18
 CONFIGURE_DIRS=                config_office
 
 # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -48,6 +48,7 @@
 ONLY_FOR_PLATFORM=     NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
 
 GNU_CONFIGURE=         yes
+CONFIGURE_ENV+=                X_LIBS=${X11_LDFLAGS:M*:Q}
 CONFIGURE_ARGS+=       --with-use-shell=bash
 CONFIGURE_ARGS+=       --enable-binfilter
 CONFIGURE_ARGS+=       --enable-cairo
@@ -61,64 +62,75 @@
 # XXX: Error in OOo internal libsndfile.
 CONFIGURE_ARGS+=       --disable-pasf --without-nas
 
+# systray quickstarter is broken with mutex handling.
+CONFIGURE_ARGS+=       --disable-systray
+
 # Disable Java.
 CONFIGURE_ARGS+=       --without-java --disable-odk --disable-gcjaot
 
 # NOTE: In this version, this value should be separated by space (comma
 #       causes build error).
-CONFIGURE_ARGS+=       --with-lang=${OPENOFFICE_LANGUAGE}
+CONFIGURE_ARGS+=       --with-lang=${OO_LANGS:Q}
 
 .include "options.mk"
 
 UNLIMIT_RESOURCES+=    datasize
 
-OPENOFFICE_VERSION=    OpenOffice.org${OO_VER}
+OO_RELEASE=            OpenOffice.org${OO_VER}
 PLIST_SRC+=            ${WRKDIR}/.PLIST_SRC
-MESSAGE_SUBST+=                OPENOFFICE_VERSION=${OPENOFFICE_VERSION}
+MESSAGE_SUBST+=                OO_RELEASE=${OO_RELEASE}
 INSTALLATION_DIRS=     bin
 
-SUBST_CLASSES+=                        X11_LDFLAGS
-SUBST_MESSAGE.X11_LDFLAGS=     Adding X11_LDFLAGS.
-SUBST_STAGE.X11_LDFLAGS=       post-patch
-SUBST_FILES.X11_LDFLAGS=       solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk
-SUBST_SED.X11_LDFLAGS=         -e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g'
-
-OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
-OO_PKGROOT=    /opt/openoffice.org2.2
-OO_PROGRAMS=   scalc sdraw simpress soffice swriter
+OO_UNXNAME=    openoffice.org2.2
+OO_PKGPATH=    ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
+OO_PKGROOT=    /opt/${OO_UNXNAME}
+OO_PROGRAMS=   scalc sdraw simpress soffice swriter unopkg
 
 post-extract:
        ${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h                \
                ${WRKSRC}/bridges/inc/bridges/cpp_uno/
 
 do-build:
-       ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "export PTHREAD_DIAGASSERT=Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
+       ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
 
 post-build:
-       cd ${WRKDIR} &&                         \
-       ${RM} -fr opt &&                        \
-       for f in ${OO_PKGPATH:Q}/*/*.sw; do     \
-               ${TAR} xpf $$f;                 \
+       cd ${WRKDIR} &&                                         \
+       ${RM} -fr opt &&                                        \
+       for l in ${OO_LANGS}; do                                \
+               for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do       \
+                       ${TAR} xpfk $$f;                        \
+               done;                                           \
        done
+       ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
+       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/soffice \"\$$@\"" \
+               >> ${WRKDIR}/${OO_UNXNAME}
+       ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
+       ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/spadmin"  \
+               >> ${WRKDIR}/${OO_UNXNAME}-printeradmin
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/${OPENOFFICE_VERSION}
-       cd ${WRKDIR}${OO_PKGROOT} &&                                    \
-       ${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OPENOFFICE_VERSION} -
-       for f in ${OO_PROGRAMS}; do                                     \
-               ${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/$$f   \
-                       ${PREFIX}/bin/$$f;                              \
+       ${INSTALL_DATA_DIR} ${PREFIX}/${OO_RELEASE}
+       cd ${WRKDIR}${OO_PKGROOT} &&                            \
+       ${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OO_RELEASE} -
+       for f in ${OO_PROGRAMS}; do                             \
+               ${LN} -sf ${PREFIX}/${OO_RELEASE}/program/$$f   \
+                       ${PREFIX}/bin/$$f;                      \
        done
+       ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin  \
+               ${PREFIX}/bin
 
 post-install:
-       cd ${PREFIX} &&                                                 \
-       ${FIND} ${OPENOFFICE_VERSION} \! -type d -print |               \
-       ${SORT} > ${PLIST_SRC} &&                                       \
-       ${FIND} ${OPENOFFICE_VERSION} -type d -print | ${SORT} -r |     \
+       cd ${PREFIX} &&                                         \
+       ${FIND} ${OO_RELEASE} \! -type d -print |               \
+       ${SORT} > ${PLIST_SRC} &&                               \
+       ${FIND} ${OO_RELEASE} -type d -print | ${SORT} -r |     \
        ${AWK} '{print("@dirrm "$$1)}' >> ${PLIST_SRC}
-       for f in ${OO_PROGRAMS}; do                                     \
-               ${ECHO} bin/$$f >> ${PLIST_SRC};                        \
+       for f in ${OO_PROGRAMS}; do                             \
+               ${ECHO} bin/$$f >> ${PLIST_SRC};                \
        done
+       ${ECHO} bin/${OO_UNXNAME} >> ${PLIST_SRC}
+       ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${PLIST_SRC}
 
 # everything specific to your OS/Arch goes into its own Makefile
 # group together i386, i486, i586 and i686 (for Linux)
diff -r 3450bebdd1e5 -r 05104e1827cd misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Sat Jun 23 23:32:30 2007 +0000
+++ b/misc/openoffice2/distinfo Mon Jun 25 15:37:45 2007 +0000
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.12.2.1 2007/05/15 23:53:47 salo Exp $
+$NetBSD: distinfo,v 1.12.2.2 2007/06/25 15:37:45 salo Exp $
 
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
-Size (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 7763249 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = a3b334c6a855366944e9e1e441a5fbe2f2d7bcb1
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 84e2bfaad21760c5a92a73aac46765ed01638ffa
-Size (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 123160673 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = fdb120f18310efb95938cdf30a0855ef8456d346
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 8b66d4e05ebfbc673eac3a5326f88d5ba0a3e7b2
-Size (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 76592096 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 311331016cbc6112e0cf9829d6ef6782acccc01b
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 90ef3a39896a15afc75094c5366f72a0a3237916
-Size (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 30976956 bytes
-SHA1 (openoffice-2.2.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
-RMD160 (openoffice-2.2.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
-Size (openoffice-2.2.0/bridge.h) = 6734 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = aa2c316e0fab13a25c07c2cfd0eafb7a50c96678
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = a6194849bb8e2130709a7ff769a8e751a43f86c6
+Size (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = 7756778 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = dad86ea3e8ed2805986c82333cf7a12040696269
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = fa6775f397bf093ad5be19c28c18d179bb1057b8
+Size (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = 123479583 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = f7c1592210c60313464b7f2cec88cb850578aec1
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 58f56faab079f179348f4c64cdbe176e296345f7
+Size (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 76560727 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 295c70a94d37b811c4ad3f437c58e564c979ad51
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 0487071a7f2cb92122984e5d928b2d7b4b55b85f
+Size (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 31149966 bytes
+SHA1 (openoffice-2.2.1/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
+RMD160 (openoffice-2.2.1/bridge.h) = 191fb56e56df85d49651988290d20db914670951
+Size (openoffice-2.2.1/bridge.h) = 6734 bytes
 SHA1 (patch-aa) = 352774b0e509f41787573594b8f8f8bbe72d6824
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c
@@ -22,8 +22,8 @@
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = 1d54fe3fd237ff053d14626f9a45ef393c90323f
 SHA1 (patch-ai) = eb985085a36647675e3f436e192847f67b5dec8c
-SHA1 (patch-aj) = 740b8829c4f480db0989302231b5c031e2c141e7
-SHA1 (patch-ak) = 2e356501dac8ace8932f4648ca4073cc41188dea
+SHA1 (patch-aj) = f18266821545da2d37e589a0a7137d14cd19d87e
+SHA1 (patch-ak) = 7775257ed056f608da3b43b0d9bb146f61e2a438
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -32,7 +32,7 @@
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 7f4c6ccfa21fec9373e9661354657f3d3338a48c
+SHA1 (patch-ba) = 0726d1331395646e2800f04d05f6dc7ec598d630
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
@@ -57,6 +57,7 @@
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 9d01592c69f0ba734ff488980c475a1b768bc229
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 4a305872dc6f0e88ebd421232b566fc4c1fa0e3d
+SHA1 (patch-ch) = bcfeb99318a16e83f2e54fb94d275224c67182fb
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
 SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
+SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
diff -r 3450bebdd1e5 -r 05104e1827cd misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Sat Jun 23 23:32:30 2007 +0000
+++ b/misc/openoffice2/options.mk       Mon Jun 25 15:37:45 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2007/03/30 13:34:53 hira Exp $
+# $NetBSD: options.mk,v 1.7.2.1 2007/06/25 15:37:46 salo Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 # kde
-PKG_OPTIONS_REQUIRED_GROUPS=   browser lang
+PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde
+PKG_OPTIONS_REQUIRED_GROUPS=   browser
 PKG_OPTIONS_GROUP.browser=     firefox # seamonkey firefox-gtk1 seamonkey-gtk1
 OO_SUPPORTED_LANGUAGES=                en-US af as-IN be-BY bg br bs ca cs cy da de \
                                el en-GB en-ZA eo es et fa fi fr ga gu-IN he \
@@ -12,7 +12,7 @@
                                ta-IN te-IN tg th ti-ER tn tr ts uk ur-IN ve \
                                vi xh zh-CN zh-TW zu
 .for l in ${OO_SUPPORTED_LANGUAGES}
-PKG_OPTIONS_GROUP.lang+=       lang-${l}
+PKG_SUPPORTED_OPTIONS+=                lang-${l}
 .endfor
 PKG_SUGGESTED_OPTIONS=         gtk2 lang-en-US firefox
 PKG_OPTIONS_LEGACY_OPTS+=      gnome-vfs:gnome
@@ -20,61 +20,64 @@
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-OPENOFFICE_LANGUAGE=           ${PKG_OPTIONS:Mlang-*:S/^lang-//1}
+.for l in ${PKG_OPTIONS:Mlang-*}
+OO_LANGS+=     ${l:S/^lang-//1}
+.endfor
+OO_LANGS?=     en-US
 
 .if !empty(PKG_OPTIONS:Mfirefox)
+CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
 .include "../../www/firefox/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
 .endif
 
 .if !empty(PKG_OPTIONS:Mfirefox-gtk1)
+CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
 .include "../../www/firefox-gtk1/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
 .endif
 
 .if !empty(PKG_OPTIONS:Mseamonkey)
+CONFIGURE_ARGS+=       --with-system-mozilla
 .include "../../www/seamonkey/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-system-mozilla
 .endif
 
 .if !empty(PKG_OPTIONS:Mseamonkey-gtk1)
+CONFIGURE_ARGS+=       --with-system-mozilla
 .include "../../www/seamonkey-gtk1/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-system-mozilla
 .endif
 
 .if !empty(PKG_OPTIONS:Mcups)
+CONFIGURE_ARGS+=       --enable-cups
 .include "../../print/cups/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-cups
 .else
 CONFIGURE_ARGS+=       --disable-cups
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=       --enable-gnome-vfs --enable-evolution2
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-gnome-vfs --enable-evolution2
 .else
 CONFIGURE_ARGS+=       --disable-gnome-vfs --disable-evolution2
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
-.include "../../x11/gtk2/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-gtk
 # *.pc files are needed with NetBSD using native XFree86.
-.if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+.  if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)



Home | Main Index | Thread Index | Old Index