diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-31 00:41:50 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-31 00:41:50 +0800 |
| commit | 2735964aa89c9327fd40846d2e2b4eca90472c85 (patch) | |
| tree | a991c524d23b9d6305c55f13738c18be8fdc19fe | |
| parent | 760588225e60c4d3edeb3bc95ef1df4cd2566f79 (diff) | |
| download | marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar.gz marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar.bz2 marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar.lz marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar.xz marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.tar.zst marcuscom-ports-2735964aa89c9327fd40846d2e2b4eca90472c85.zip | |
Sync bsd.gnome.mk with the gal2 and gtkhtml3 versions that will be used for
GNOME 2.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2206 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 8bf5d9aee..9378b85b0 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -43,7 +43,7 @@ _USE_GNOME_ALL+=glib20 atk pango gtk20 linc libidl orbit2 \ libgtkhtml gnomedesktop libwnck vte libzvt librsvg2 eel2 \ gnomepanel nautilus2 metacity gal2 gnomecontrolcenter2 libgda2 \ libgnomedb gtksourceview libgsf pygtk2 pygnome2 gstreamerplugins \ - gtkhtml3 evolutiondataserver + gtkhtml3 SCROLLKEEPER_DIR= /var/db/scrollkeeper gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -356,7 +356,7 @@ metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity metacity_DETECT= ${X11BASE}/libdata/pkgconfig/libmetacity-private.pc metacity_USE_GNOME_IMPL=gconf2 glade2 -gal2_LIB_DEPENDS= gal-2.2.0:${PORTSDIR}/x11-toolkits/gal2 +gal2_LIB_DEPENDS= gal-2.0.6:${PORTSDIR}/x11-toolkits/gal2 gal2_DETECT= ${X11BASE}/libdata/pkgconfig/gal-2.0.pc gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui @@ -407,14 +407,10 @@ intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${RE s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";|' intlhack_USE_GNOME_IMPL=intltool -gtkhtml3_LIB_DEPENDS= gtkhtml-3.1.6:${PORTSDIR}/www/gtkhtml3 -gtkhtml3_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-3.1.pc +gtkhtml3_LIB_DEPENDS= gtkhtml-3.0.4:${PORTSDIR}/www/gtkhtml3 +gtkhtml3_DETECT= ${X11BASE}/libdata/pkgconfig/libgtkhtml-3.0.pc gtkhtml3_USE_GNOME_IMPL=gal2 gail -evolutiondataserver_LIB_DEPENDS=edataserver.3:${PORTSDIR}/databases/evolution-data-server -evolutiondataserver_DETECT= ${X11BASE}/libdata/pkgconfig/evolution-data-server-1.0.pc -evolutiondataserver_USE_GNOME_IMPL=gtkhtml3 - # End component definition section # This section defines tests for optional software. These work off four @@ -555,14 +551,8 @@ _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} _COMP_TEST= ${_USE_GNOME:M${component}} . if ${_COMP_TEST:S/${component}//}!=${_COMP_TEST:S/ / /g} BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} -####################################################### -# -# *** WARNING: DO NOT MERGE THIS NEXT LINE TO FREEBSD -# -.if !defined(NODEPENDS) LIB_DEPENDS+= ${${component}_LIB_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} -.endif CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS} CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} |