cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- SHARED_LIBS and USE_LIBTOOL

Browse Source 
- regen PLIST with new gettext
- remove old libtool patch
This commit is contained in:
steven 2006-01-08 14:35:20 +00:00
parent b351011170
commit 2e63647074
4 changed files with 7 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/libgnome/Makefile
View File

@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2005/05/24 21:57:26 marcm Exp $
# $OpenBSD: Makefile,v 1.13 2006/01/08 14:35:20 steven Exp $
COMMENT= "libraries for the GNOME project"
DISTNAME= libgnome-2.10.0
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= gnome-2 1000.0
CATEGORIES= x11/gnome
HOMEPAGE= http://www.gnome.org/
@ -29,6 +31,7 @@ LIB_DEPENDS= esd.2.26::audio/esound \
audiofile::devel/libaudiofile
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu old
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome"

70
x11/gnome/libgnome/patches/patch-ltmain_sh
View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2004/06/23 03:26:14 marcm Exp $
--- ltmain.sh.orig 2004-04-11 20:01:57.000000000 -0600
+++ ltmain.sh 2004-06-20 11:11:48.000000000 -0600
@@ -1857,9 +1857,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*)
@@ -2274,10 +2277,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
@@ -5827,40 +5826,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
;;

4
x11/gnome/libgnome/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/05/24 21:57:26 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.9 2006/01/08 14:35:20 steven Exp $
lib/bonobo/monikers/libmoniker_extra_2.so
@lib lib/libgnome-2.so.1000.0
@lib lib/libgnome-2.so.${LIBgnome-2_VERSION}

12
x11/gnome/libgnome/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2005/05/24 21:57:26 marcm Exp $
@comment $OpenBSD: PLIST,v 1.12 2006/01/08 14:35:20 steven Exp $
bin/gnome-open
include/libgnome-2.0/
include/libgnome-2.0/libgnome/
@ -75,8 +75,6 @@ share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/be/
share/locale/be/LC_MESSAGES/
share/locale/be/LC_MESSAGES/libgnome-2.0.mo
share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
share/locale/bn/
@ -85,8 +83,6 @@ share/locale/bn/LC_MESSAGES/libgnome-2.0.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/libgnome-2.0.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/libgnome-2.0.mo
share/locale/cs/LC_MESSAGES/libgnome-2.0.mo
share/locale/cy/
@ -111,8 +107,6 @@ share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
share/locale/gu/
@ -167,8 +161,6 @@ share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
share/locale/sr/
share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/libgnome-2.0.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
@ -185,8 +177,6 @@ share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/libgnome-2.0.mo
share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/