Update for Evolution... oh and Gnome 2.10 too :).

This commit is contained in:
marcm 2005-05-24 22:09:39 +00:00
parent 1d54001064
commit 8a8976c83f
5 changed files with 30 additions and 86 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2005/03/10 07:39:52 marcm Exp $
# $OpenBSD: Makefile,v 1.12 2005/05/24 22:09:39 marcm Exp $
COMMENT= "GNOME Application Libs"
VERSION= 2.2.5
VERSION= 2.4.2
DISTNAME= gal-${VERSION}
PKGNAME= gal2-${VERSION}
CATEGORIES= devel x11/gnome
@ -16,18 +16,19 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2.0.0 SM X11 Xext Xft Xinerama Xrender \
WANTLIB= ICE SM X11 Xft Xrender ssl z \
ORBit-2.0.0 ORBitCosNaming-2.0.0 \
art_lgpl_2.0.0 atk-1.0.0.0 bonobo-2.0.0 \
bonobo-activation bonoboui-2.0.0 fontconfig \
freetype gconf-2.0.0 gdk-x11-2.0.0.0 \
gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
gmodule-2.0.0.0 gnome-2.0.0 gnomecanvas-2.0.0 \
gnomeprint-2-2.0.0 gnomevfs-2.0.0 gobject-2.0.0.0 \
gnomeprint-2-2 gnomevfs-2.0.0 gobject-2.0.0.0 \
gthread-2.0.0.0 gtk-x11-2.0.0.0 m pango-1.0.0.0 \
pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
popt xml2 z Xcursor
popt xml2 audiofile jpeg crypto esd gnome-keyring
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal/2.2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal/2.4/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
@ -37,16 +38,16 @@ BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
gnomeprintui-2-2::x11/gnome/libgnomeprintui
SEPARATE_BUILD= concurrent
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
API_VERSION= 2.2
API_VERSION= 2.4
SUBST_VARS= VERSION API_VERSION
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (gal-2.2.5.tar.bz2) = a3face85eb306dffd773fe8812912882
RMD160 (gal-2.2.5.tar.bz2) = 9d70ef057d2189eec5d4eea5c3c48bf1811c28af
SHA1 (gal-2.2.5.tar.bz2) = 89014f457ebcfd1e895d595ac9e6a920461974e1
SIZE (gal-2.2.5.tar.bz2) = 1160976
MD5 (gal-2.4.2.tar.bz2) = 70e07fde659f0553ba56caeae4f51908
RMD160 (gal-2.4.2.tar.bz2) = 7834d5236ceccdfe66d2ec67fa1a7bc7c9bb880f
SHA1 (gal-2.4.2.tar.bz2) = 2ee6bbadf577eee0d6d341ad8e46ab4558915e8d
SIZE (gal-2.4.2.tar.bz2) = 1199147

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2004/09/15 04:19:24 marcm Exp $
--- ltmain.sh.orig Thu Aug 19 13:37:57 2004
+++ ltmain.sh Sun Sep 5 20:13:25 2004
@@ -1978,9 +1978,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
-l*)
@@ -2417,10 +2420,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5807,40 +5806,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2004/12/11 06:03:47 marcm Exp $
@lib lib/libgal-${API_VERSION}.so.1.3
@lib lib/libgal-a11y-${API_VERSION}.so.1.3
@comment $OpenBSD: PFRAG.shared,v 1.7 2005/05/24 22:09:40 marcm Exp $
@lib lib/libgal-${API_VERSION}.so.0.0
@lib lib/libgal-a11y-${API_VERSION}.so.0.0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2004/10/26 03:50:02 marcm Exp $
@comment $OpenBSD: PLIST,v 1.7 2005/05/24 22:09:40 marcm Exp $
include/gal-${API_VERSION}/
include/gal-${API_VERSION}/gal/
include/gal-${API_VERSION}/gal/a11y/
@ -8,6 +8,7 @@ include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell-registry.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell-text.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell-toggle.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell-tree.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell-vbox.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-cell.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
include/gal-${API_VERSION}/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h
@ -229,6 +230,9 @@ share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/cs/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/cy/
share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/da/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/de/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/el/LC_MESSAGES/gal-${API_VERSION}.mo
@ -243,6 +247,9 @@ share/locale/et/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/fi/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/fr/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/ga/
@ -283,6 +290,9 @@ share/locale/pt/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/pt_BR/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/ro/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/ru/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/sk/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/sl/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/sq/
@ -306,6 +316,9 @@ share/locale/uk/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/zh_CN/LC_MESSAGES/gal-${API_VERSION}.mo
share/locale/zh_TW/LC_MESSAGES/gal-${API_VERSION}.mo
%%SHARED%%