[Midnightbsd-cvs] mports: bsd.gnome.mk: back this out until we figure out what's wrong.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 31 17:15:21 EDT 2008
Log Message:
-----------
back this out until we figure out what's wrong.
Modified Files:
--------------
mports/Mk:
bsd.gnome.mk (r1.10 -> r1.11)
-------------- next part --------------
Index: bsd.gnome.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.gnome.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -L Mk/bsd.gnome.mk -L Mk/bsd.gnome.mk -u -r1.10 -r1.11
--- Mk/bsd.gnome.mk
+++ Mk/bsd.gnome.mk
@@ -45,9 +45,8 @@
#
# non-version specific components
-_USE_GNOME_ALL= esound intlhack intltool ltasneededhack lthack ltverhack \
- gnomehack referencehack gnomehier gnomemimedata gnomeprefix \
- gnometarget pkgconfig
+_USE_GNOME_ALL= esound intlhack intltool lthack ltverhack gnomehack \
+ referencehack gnomehier gnomemimedata gnomeprefix gnometarget pkgconfig
# GNOME 1 components
_USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \
@@ -57,9 +56,9 @@
# GNOME 2 components
_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \
- gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
+ gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \
gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \
- gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \
+ gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \
libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \
libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \
libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \
@@ -73,7 +72,6 @@
's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
- s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' ; \
${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -253,13 +251,9 @@
pygnome_RUN_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome
pygnome_USE_GNOME_IMPL= gtkhtml pygtk
-_glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20
-_glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
-_glib20_USE_GNOME_IMPL= gnometarget pkgconfig
-
-glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend
-glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so
-glib20_USE_GNOME_IMPL= _glib20
+glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20
+glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
+glib20_USE_GNOME_IMPL=gnometarget pkgconfig
atk_LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/accessibility/atk
atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc
@@ -304,11 +298,11 @@
gconf2_LIB_DEPENDS= gconf-2.4:${PORTSDIR}/devel/gconf2
gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc
-gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20
+gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 linc
gnomevfs2_LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnome-vfs
gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc
-gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata
+gnomevfs2_USE_GNOME_IMPL=gconf2 libbonobo gnomemimedata
gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail
gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc
@@ -332,7 +326,7 @@
libgnome_LIB_DEPENDS= gnome-2.0:${PORTSDIR}/x11/libgnome
libgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc
-libgnome_USE_GNOME_IMPL=gnomevfs2 esound libbonobo
+libgnome_USE_GNOME_IMPL=libxslt gnomevfs2 esound
libbonoboui_LIB_DEPENDS= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui
libbonoboui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc
@@ -377,16 +371,16 @@
eel2_LIB_DEPENDS= eel-2.2:${PORTSDIR}/x11-toolkits/eel
eel2_DETECT= ${LOCALBASE}/libdata/pkgconfig/eel-2.0.pc
-eel2_USE_GNOME_IMPL= gnomedesktop gail
+eel2_USE_GNOME_IMPL= gnomemenus gnomedesktop gail
gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel
gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc
-gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2
+gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils
gnomepanel_GNOME_DESKTOP_VERSION=2
nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus
nautilus2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc
-nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils gvfs
+nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils
nautilus2_GNOME_DESKTOP_VERSION=2
metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity
@@ -405,11 +399,11 @@
libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc
libgda2_USE_GNOME_IMPL= glib20 libxslt
-libgda3_LIB_DEPENDS= gda-3.0.3:${PORTSDIR}/databases/libgda3
-libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-3.0.pc
+libgda3_LIB_DEPENDS= gda-3.3:${PORTSDIR}/databases/libgda3
+libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-2.0.pc
libgda3_USE_GNOME_IMPL= glib20 libxslt
-libgnomedb_LIB_DEPENDS= gnomedb-3.0.4:${PORTSDIR}/databases/libgnomedb
+libgnomedb_LIB_DEPENDS= gnomedb-3.4:${PORTSDIR}/databases/libgnomedb
libgnomedb_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomedb.pc
libgnomedb_USE_GNOME_IMPL=libgnomeui libgda3
@@ -475,7 +469,7 @@
gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus
gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc
-gnomemenus_USE_GNOME_IMPL= glib20
+gnomemenus_USE_GNOME_IMPL= gnomevfs2
pygnomeextras_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-extras-2.0.pc
pygnomeextras_BUILD_DEPENDS= ${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-extras
@@ -513,13 +507,9 @@
pygtksourceview_USE_GNOME_IMPL= gtksourceview2 pygtk2
libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS= gnomekbd.2:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_LIB_DEPENDS= gnomekbd.1:${PORTSDIR}/x11/libgnomekbd
libgnomekbd_USE_GNOME_IMPL= libgnomeui
-gvfs_DETECT= ${LOCALBASE}/lib/libgvfscommon.so
-gvfs_LIB_DEPENDS= gvfscommon.0:${PORTSDIR}/devel/gvfs
-gvfs_USE_GNOME_IMPL= glib20 gconf2
-
# End component definition section
# This section defines tests for optional software. These work off four
@@ -612,10 +602,6 @@
Gnome_Post_Include= bsd.gnome.mk
-.if !defined(Gnome_Pre_Include)
-.error The Pre include part of bsd.gnome.mk part is not included. Did you forget WANT_GNOME=yes before bsd.port.pre.mk?
-.endif
-
# DO NOT USE THESE MACROS! They are obsolete, and only provided for
# backward compatibility with old ports that have not converted to the new
# GNOME infrastructure.
@@ -668,7 +654,7 @@
# we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is
# included in the post-makefile section).
.if defined(AUTOTOOL_libtool)
-lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
+ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \
${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \
for file in ${LIBTOOLFILES}; do \
${REINPLACE_CMD} -e \
@@ -677,13 +663,13 @@
${PATCH_WRKSRC}/$$file; \
done;
.else
-. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!=""
-IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool
+. if ${USE_GNOME:Mltverhack}!=""
+IGNORE= cannot install: ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
. endif
.endif
ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \
+ltverhack_PRE_PATCH+= for file in gnome-ltmain.sh gnome-libtool; do \
if [ -f ${WRKDIR}/$$file ]; then \
${REINPLACE_CMD} -e \
'/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
@@ -692,28 +678,15 @@
fi; \
done
-ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH= if [ -f ${WRKDIR}/gnome-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \
- ${WRKDIR}/gnome-libtool; \
- fi
-
# Then traverse through all components, check which of them
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
-. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= ""
-GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH}
-.endif
. for component in ${_USE_GNOME_ALL}
. if ${_USE_GNOME:M${component}}!=""
PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS}
FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS}
EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS}
BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS}
-#######################################################
-
LIB_DEPENDS+= ${${component}_LIB_DEPENDS}
RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
More information about the Midnightbsd-cvs
mailing list