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

- Use new SHARED_LIBS framework

Browse Source 
- USE_LIBTOOL and bump PKGNAME where appropriate
- regen PLIST with new gettext for libgtop and libgtop2
This commit is contained in:
bernd 2006-01-03 18:07:27 +00:00
parent b2a70fdd85
commit 3ff69c6673
15 changed files with 67 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/libgsf/Makefile
View File

@ -1,12 +1,19 @@
# $OpenBSD: Makefile,v 1.9 2005/09/16 09:51:27 espie Exp $
# $OpenBSD: Makefile,v 1.10 2006/01/03 18:07:27 bernd Exp $
COMMENT= "GNOME Structured File library"
COMMENT-gnome= "GNOME specific extensions to libgsf"
VERSION= 1.11.1
DISTNAME= libgsf-${VERSION}
PKGNAME= ${DISTNAME}p1
PKGNAME-gnome= libgsf-gnome-${VERSION}p0
PKGNAME= ${DISTNAME}p2
PKGNAME-gnome= libgsf-gnome-${VERSION}p1
SHARED_LIBS= gsf-1 12.1 \
gsf-gnome-1 12.1
MODGNU_SHARED_LIBS= gsf-1 '' \
gsf-gnome-1 ''
LIBgsf-1_ALIAS= gsf_1
LIBgsf-gnome-1_ALIAS= gsf_gnome_1
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/
@ -32,6 +39,7 @@ LIB_DEPENDS= bz2.10.2::archivers/bzip2 \
glib-2.0.0.11,gobject-2.0.0.11::devel/glib2
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --disable-gtk-doc

70
devel/libgsf/patches/patch-ltmain_sh
View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2004/12/10 20:33:59 marcm Exp $
--- ltmain.sh.orig Wed Dec 1 11:10:40 2004
+++ ltmain.sh Tue Dec 7 20:20:47 2004
@@ -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*)
@@ -2270,10 +2273,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
@@ -5828,40 +5827,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
devel/libgsf/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2004/12/10 20:33:59 marcm Exp $
@lib lib/libgsf-1.so.12.1
@comment $OpenBSD: PFRAG.shared,v 1.6 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgsf-1.so.${LIBgsf-1_VERSION}

4
devel/libgsf/pkg/PFRAG.shared-gnome
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-gnome,v 1.4 2004/12/10 20:33:59 marcm Exp $
@lib lib/libgsf-gnome-1.so.12.1
@comment $OpenBSD: PFRAG.shared-gnome,v 1.5 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgsf-gnome-1.so.${LIBgsf-gnome-1_VERSION}

21
devel/libgtop/Makefile
View File

@ -1,9 +1,28 @@
# $OpenBSD: Makefile,v 1.22 2005/12/04 12:17:47 alek Exp $
# $OpenBSD: Makefile,v 1.23 2006/01/03 18:07:28 bernd Exp $
COMMENT= "portable library for obtaining system information"
DISTNAME= libgtop-1.0.13
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= gtop 1.12 \
gtop_common 1.12 \
gtop_guile 1.12 \
gtop_guile_names 1.12 \
gtop_names 1.12 \
gtop_suid_common 1.12 \
gtop_sysdeps 1.12 \
gtop_sysdeps_suid 1.12 \
gnomesupport 0.0
MODGNU_SHARED_LIBS= gtop '' \
gtop_common '' \
gtop_guile '' \
gtop_guile_names '' \
gtop_names '' \
gtop_suid_common '' \
gtop_sysdeps '' \
gtop_sysdeps_suid '' \
gnomesupport ''
CATEGORIES= devel
MAINTAINER= Jim Geovedi <jim@corebsd.or.id>

20
devel/libgtop/pkg/PFRAG.shared
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/09 15:00:56 espie Exp $
@comment @lib lib/libgnomesupport.so.0.0
@lib lib/libgtop.so.1.12
@lib lib/libgtop_common.so.1.12
@comment @lib lib/libgtop_guile.so.1.12
@comment @lib lib/libgtop_guile_names.so.1.12
@lib lib/libgtop_names.so.1.12
@lib lib/libgtop_suid_common.so.1.12
@lib lib/libgtop_sysdeps.so.1.12
@lib lib/libgtop_sysdeps_suid.so.1.12
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/03 18:07:28 bernd Exp $
@comment @lib lib/libgnomesupport.so.${LIBgnomesupport_VERSION}
@lib lib/libgtop.so.${LIBgtop_VERSION}
@lib lib/libgtop_common.so.${LIBgtop_common_VERSION}
@comment @lib lib/libgtop_guile.so.${LIBgtop_guile_VERSION}
@comment @lib lib/libgtop_guile_names.so.${LIBgtop_guile_names_VERSION}
@lib lib/libgtop_names.so.${LIBgtop_names_VERSION}
@lib lib/libgtop_suid_common.so.${LIBgtop_suid_common_VERSION}
@lib lib/libgtop_sysdeps.so.${LIBgtop_sysdeps_VERSION}
@lib lib/libgtop_sysdeps_suid.so.${LIBgtop_sysdeps_suid_VERSION}

6
devel/libgtop/pkg/PFRAG.shared-guile
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared-guile,v 1.3 2004/09/15 19:39:34 espie Exp $
@lib lib/libgtop_guile.so.1.12
@lib lib/libgtop_guile_names.so.1.12
@comment $OpenBSD: PFRAG.shared-guile,v 1.4 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgtop_guile.so.${LIBgtop_guile_VERSION}
@lib lib/libgtop_guile_names.so.${LIBgtop_guile_names_VERSION}

4
devel/libgtop/pkg/PFRAG.shared-no-gnome
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-no-gnome,v 1.1 2004/09/15 19:39:34 espie Exp $
@lib lib/libgnomesupport.so.0.0
@comment $OpenBSD: PFRAG.shared-no-gnome,v 1.2 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgnomesupport.so.${LIBgnomesupport_VERSION}

6
devel/libgtop/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2004/08/09 15:00:56 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2006/01/03 18:07:28 bernd Exp $
bin/libgtop-config
bin/libgtop_daemon
@mode 2755
@ -72,8 +72,6 @@ lib/libgtop_sysdeps_suid.la
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/libgtop.mo
share/locale/da/LC_MESSAGES/libgtop.mo
share/locale/de/LC_MESSAGES/libgtop.mo
@ -102,8 +100,6 @@ share/locale/es_SV/LC_MESSAGES/
share/locale/es_SV/LC_MESSAGES/libgtop.mo
share/locale/fi/LC_MESSAGES/libgtop.mo
share/locale/fr/LC_MESSAGES/libgtop.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/libgtop.mo
share/locale/gl/LC_MESSAGES/libgtop.mo
share/locale/hu/LC_MESSAGES/libgtop.mo

9
devel/libgtop2/Makefile
View File

@ -1,10 +1,14 @@
# $OpenBSD: Makefile,v 1.15 2005/05/25 23:28:16 marcm Exp $
# $OpenBSD: Makefile,v 1.16 2006/01/03 18:07:28 bernd Exp $
COMMENT= "portable library for obtaining system information"
V= 2.10.1
DISTNAME= libgtop-${V}
PKGNAME= libgtop2-${V}
PKGNAME= libgtop2-${V}p0
SHARED_LIBS= gtop-2.0 5.0
MODGNU_SHARED_LIBS= gtop-2.0 '-export-symbols-regex "^[^_].*"'
LIBgtop-2.0_ALIAS= gtop_2_0
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org
@ -25,6 +29,7 @@ LIB_DEPENDS= glib-2.0.0.0::devel/glib2 \
popt::devel/popt
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

70
devel/libgtop2/patches/patch-ltmain_sh
View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.7 2004/12/11 17:41:53 marcm Exp $
--- ltmain.sh.orig Mon Nov 29 11:26:25 2004
+++ ltmain.sh Fri Dec 10 17:32:05 2004
@@ -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*)
@@ -2270,10 +2273,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
@@ -5828,40 +5827,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
devel/libgtop2/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.9 2005/05/25 23:28:16 marcm Exp $
@lib lib/libgtop-2.0.so.5.0
@comment $OpenBSD: PFRAG.shared,v 1.10 2006/01/03 18:07:28 bernd Exp $
@lib lib/libgtop-2.0.so.${LIBgtop-2.0_VERSION}

12
devel/libgtop2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2005/05/25 23:28:16 marcm Exp $
@comment $OpenBSD: PLIST,v 1.11 2006/01/03 18:07:28 bernd Exp $
bin/libgtop_daemon2
bin/libgtop_server2
include/libgtop-2.0/
@ -57,8 +57,6 @@ share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/libgtop-2.0.mo
share/locale/be/
share/locale/be/LC_MESSAGES/
share/locale/be/LC_MESSAGES/libgtop-2.0.mo
share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
share/locale/bn/
@ -67,8 +65,6 @@ share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
share/locale/bs/
share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
share/locale/cy/
@ -93,8 +89,6 @@ share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
share/locale/gu/
@ -155,8 +149,6 @@ share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
share/locale/sr/
share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
@ -167,8 +159,6 @@ share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/

5
devel/libicq2000/Makefile
View File

@ -1,9 +1,12 @@
# $OpenBSD: Makefile,v 1.10 2005/11/11 21:19:13 naddy Exp $
# $OpenBSD: Makefile,v 1.11 2006/01/03 18:07:28 bernd Exp $
COMMENT= "protocol icq2000/2001 library"
DISTNAME= libicq2000-0.3.2
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= icq2000 5.1
MODGNU_SHARED_LIBS= icq2000 ''
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libicq2000/}

4
devel/libicq2000/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/09 15:20:24 espie Exp $
@lib lib/libicq2000.so.5.1
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/03 18:07:28 bernd Exp $
@lib lib/libicq2000.so.${LIBicq2000_VERSION}