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

SHARED_LIBS

Browse Source 
USE_LIBTOOL where appropriate
This commit is contained in:
sturm 2005-12-24 20:52:58 +00:00
parent 7caae7d3d8
commit 7c759dbddd
21 changed files with 157 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/clamav/Makefile
View File

@ -1,8 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2005/11/06 19:31:43 mbalmer Exp $
# $OpenBSD: Makefile,v 1.13 2005/12/24 20:52:58 sturm Exp $
COMMENT= "virus scanner"
DISTNAME= clamav-0.87.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= security
SHARED_LIBS= clamav 1.16
MODGNU_SHARED_LIBS= clamav ''
LIBclamav_ALIAS= realclamav
HOMEPAGE= http://www.clamav.net/
@ -27,6 +31,8 @@ RUN_DEPENDS= :lha-*:archivers/lha \
:arc-*:archivers/arc \
:unzip-*:archivers/unzip
USE_LIBTOOL= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} \
${HOMEPAGE}

12
security/clamav/patches/patch-libclamav_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libclamav_Makefile_am,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- libclamav/Makefile.am.orig Sat Dec 24 19:26:40 2005
+++ libclamav/Makefile.am Sat Dec 24 19:27:59 2005
@@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir) -I@srcdir@/zz
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
+libclamav_la_LDFLAGS = @TH_SAFE@ ${librealclamav_la_LDFLAGS} -no-undefined
include_HEADERS = clamav.h

8
security/clamav/patches/patch-libclamav_ole2_extract_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libclamav_ole2_extract_c,v 1.1 2005/06/29 10:12:09 mbalmer Exp $
--- libclamav/ole2_extract.c.orig Wed Jun 29 11:32:53 2005
+++ libclamav/ole2_extract.c Wed Jun 29 11:34:42 2005
@@ -141,7 +141,7 @@ typedef struct property_tag
$OpenBSD: patch-libclamav_ole2_extract_c,v 1.2 2005/12/24 20:52:58 sturm Exp $
--- libclamav/ole2_extract.c.orig Wed Oct 26 00:49:11 2005
+++ libclamav/ole2_extract.c Sat Dec 24 19:26:20 2005
@@ -142,7 +142,7 @@ typedef struct property_tag
unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};

80
security/clamav/patches/patch-ltmain_sh
View File

@ -1,80 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2005/05/12 14:55:21 mbalmer Exp $
--- ltmain.sh.orig Tue Jun 24 00:48:14 2003
+++ ltmain.sh Tue Jun 24 00:50:20 2003
@@ -1035,39 +1035,45 @@ compiler."
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- case $host in
- *-*-cygwin* | *-*-pw32* | *-*-beos*)
- # These systems don't actually have a C or math library (as such)
- continue
- ;;
- *-*-mingw* | *-*-os2*)
- # These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
- ;;
- *-*-openbsd* | *-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
- ;;
- esac
- # This change is required for -lc_r under FreeBSD / Tomasz Kojm
- #elif test "X$arg" = "X-lc_r"; then
- # case $host in
- #*-*-openbsd* | *-*-freebsd*)
- # # Do not include libc_r directly, use -pthread flag.
- # continue
- # ;;
- # esac
- fi
- deplibs="$deplibs $arg"
- continue
- ;;
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ # These systems don't actually have c library (as such)
+ continue
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lm"; then
+ case "$host" in
+ *-*-cygwin* | *-*-beos*)
+ # These systems don't actually have math library (as such)
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ ;;
- # We need this change for old -pthread *BSD style / Tomasz Kojm
-pthread)
- deplibs="$deplibs -pthread"
- continue
- ;;
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
-module)
module=yes

4
security/clamav/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2005/07/27 22:15:24 mbalmer Exp $
@lib lib/libclamav.so.1.16
@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/24 20:52:58 sturm Exp $
@lib lib/libclamav.so.${LIBclamav_VERSION}

25
security/cyrus-sasl2/Makefile
View File

@ -1,13 +1,33 @@
# $OpenBSD: Makefile,v 1.32 2005/12/20 05:57:19 pvalchev Exp $
# $OpenBSD: Makefile,v 1.33 2005/12/24 20:52:58 sturm Exp $
COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)"
VERSION= 2.1.21
LIBVERSION= 2.21
DISTNAME= cyrus-sasl-${VERSION}
PKGNAME= ${DISTNAME}p0
CATEGORIES= security
SHARED_LIBS= anonymous 2.21 \
crammd5 2.21 \
digestmd5 2.21 \
gssapiv2 2.21 \
login 2.21 \
otp 2.21 \
plain 2.21 \
sasl2 2.21 \
sasldb 2.21 \
sql 2.21
MODGNU_SHARED_LIBS=anonymous '' \
crammd5 '' \
digestmd5 '' \
gssapiv2 '' \
login '' \
otp '' \
plain '' \
sasl2 '' \
sasldb '' \
sql ''
LIBsql_ALIAS= realsql
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@ -22,7 +42,6 @@ PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
WANTLIB= asn1 c com_err crypto gssapi krb5
SUBST_VARS+= LIBVERSION
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LDFLAGS='${LDFLAGS}'

12
security/cyrus-sasl2/patches/patch-plugins_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_Makefile_am,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- plugins/Makefile.am.orig Sat May 7 06:54:18 2005
+++ plugins/Makefile.am Sat Dec 24 21:43:55 2005
@@ -148,7 +148,7 @@ libldapdb_la_DEPENDENCIES = $(COMPAT_OBJ
libldapdb_la_LIBADD = $(COMPAT_OBJS)
libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
+libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) ${librealsql_la_LDFLAGS}
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
libsql_la_LIBADD = $(COMPAT_OBJS)

20
security/cyrus-sasl2/pkg/PFRAG.shared
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PFRAG.shared,v 1.12 2005/12/18 10:37:26 jakob Exp $
@lib lib/libsasl2.so.${LIBVERSION}
@lib lib/sasl2/libanonymous.so.${LIBVERSION}
@lib lib/sasl2/libcrammd5.so.${LIBVERSION}
@lib lib/sasl2/libdigestmd5.so.${LIBVERSION}
@lib lib/sasl2/libgssapiv2.so.${LIBVERSION}
@lib lib/sasl2/liblogin.so.${LIBVERSION}
@lib lib/sasl2/libotp.so.${LIBVERSION}
@lib lib/sasl2/libplain.so.${LIBVERSION}
@lib lib/sasl2/libsasldb.so.${LIBVERSION}
@comment $OpenBSD: PFRAG.shared,v 1.13 2005/12/24 20:52:58 sturm Exp $
@lib lib/libsasl2.so.${LIBsasl2_VERSION}
@lib lib/sasl2/libanonymous.so.${LIBanonymous_VERSION}
@lib lib/sasl2/libcrammd5.so.${LIBcrammd5_VERSION}
@lib lib/sasl2/libdigestmd5.so.${LIBdigestmd5_VERSION}
@lib lib/sasl2/libgssapiv2.so.${LIBgssapiv2_VERSION}
@lib lib/sasl2/liblogin.so.${LIBlogin_VERSION}
@lib lib/sasl2/libotp.so.${LIBotp_VERSION}
@lib lib/sasl2/libplain.so.${LIBplain_VERSION}
@lib lib/sasl2/libsasldb.so.${LIBsasldb_VERSION}

4
security/cyrus-sasl2/pkg/PFRAG.shared-mysql
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-mysql,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}
@comment $OpenBSD: PFRAG.shared-mysql,v 1.3 2005/12/24 20:52:58 sturm Exp $
@lib lib/sasl2/libsql.so.${LIBsql_VERSION}

4
security/cyrus-sasl2/pkg/PFRAG.shared-pgsql
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-pgsql,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}
@comment $OpenBSD: PFRAG.shared-pgsql,v 1.3 2005/12/24 20:52:58 sturm Exp $
@lib lib/sasl2/libsql.so.${LIBsql_VERSION}

4
security/cyrus-sasl2/pkg/PFRAG.shared-sqlite
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-sqlite,v 1.2 2005/12/18 10:37:26 jakob Exp $
@lib lib/sasl2/libsql.so.${LIBVERSION}
@comment $OpenBSD: PFRAG.shared-sqlite,v 1.3 2005/12/24 20:52:58 sturm Exp $
@lib lib/sasl2/libsql.so.${LIBsql_VERSION}

11
security/dante/Makefile
View File

@ -1,10 +1,15 @@
# $OpenBSD: Makefile,v 1.31 2005/09/14 14:10:14 jakob Exp $
# $OpenBSD: Makefile,v 1.32 2005/12/24 20:52:58 sturm Exp $
COMMENT= "SOCKS client and server"
DISTNAME= dante-1.1.18
PKGNAME= ${DISTNAME}
PKGNAME= ${DISTNAME}p0
CATEGORIES= security
SHARED_LIBS= dsocks 1.1 \
socks 1.1
MODGNU_SHARED_LIBS=dsocks '-all-dynamic' \
socks ''
MASTER_SITES= ftp://ftp.inet.no/pub/socks/
HOMEPAGE= http://www.inet.no/dante/
@ -23,6 +28,8 @@ CONFIGURE_ARGS+= --enable-static
MODGNU_CONFIG_GUESS_DIRS+= ${WRKSRC}
USE_LIBTOOL= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dante
${INSTALL_DATA} ${WRKSRC}/doc/README.* ${PREFIX}/share/doc/dante

6
security/dante/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.10 2005/03/16 15:34:49 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.11 2005/12/24 20:52:58 sturm Exp $
@conflict dsocks-*
@lib lib/libdsocks.so.1.0
@lib lib/libsocks.so.1.0
@lib lib/libdsocks.so.${LIBdsocks_VERSION}
@lib lib/libsocks.so.${LIBsocks_VERSION}

3
security/dante/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.12 2004/09/18 13:06:43 espie Exp $
@comment $OpenBSD: PLIST,v 1.13 2005/12/24 20:52:58 sturm Exp $
@conflict socks5-*
bin/socksify
include/socks.h
lib/libdsocks.a
lib/libdsocks.la
lib/libsocks.a
lib/libsocks.la

17
security/gnutls/Makefile
View File

@ -1,10 +1,19 @@
# $OpenBSD: Makefile,v 1.9 2005/05/11 11:16:07 robert Exp $
# $OpenBSD: Makefile,v 1.10 2005/12/24 20:52:58 sturm Exp $
COMMENT= "GNU Transport Layer Security library"
VERSION= 1.0.25
DISTNAME= gnutls-${VERSION}
DISTNAME= gnutls-1.0.25
PKGNAME= ${DISTNAME}p0
CATEGORIES= security
SHARED_LIBS= gnutls-extra 12.25 \
gnutls-openssl 12.25 \
gnutls 12.25
MODGNU_SHARED_LIBS= gnutls-extra '' \
gnutls-openssl '' \
gnutls ''
LIBgnutls-extra_ALIAS= realgnutls_extra
LIBgnutls-openssl_ALIAS=gnutls_openssl
LIBgnutls_ALIAS= realgnutls
HOMEPAGE= http://www.gnutls.org/
MAINTAINER= Jim Geovedi <jim@corebsd.or.id>
@ -25,6 +34,8 @@ MODULES= converters/libiconv
LIB_DEPENDS= gcrypt.12::security/libgcrypt \
opencdk.8::security/opencdk
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-included-libtasn1 \

13
security/gnutls/patches/patch-lib_Makefile_am Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_Makefile_am,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- lib/Makefile.am.orig Sat Dec 24 20:53:02 2005
+++ lib/Makefile.am Sat Dec 24 20:53:40 2005
@@ -67,8 +67,7 @@ COBJECTS = gnutls_record.c gnutls_compre
libgnutls_la_SOURCES = $(COBJECTS) $(X509_COBJECTS) $(MINITASN1_COBJECTS)
libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
- $(LIBGNUTLS_EXPORTS) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ $(LIBGNUTLS_EXPORTS) ${librealgnutls_la_LDFLAGS}
pkix_asn1_tab.c: pkix.asn
-asn1Parser pkix.asn pkix_asn1_tab.c

13
security/gnutls/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- lib/Makefile.in.orig Sat Dec 24 21:17:16 2005
+++ lib/Makefile.in Sat Dec 24 21:17:39 2005
@@ -352,8 +352,7 @@ COBJECTS = gnutls_record.c gnutls_compre
# Separate so we can create the documentation
libgnutls_la_SOURCES = $(COBJECTS) $(X509_COBJECTS) $(MINITASN1_COBJECTS)
libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
- $(LIBGNUTLS_EXPORTS) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ $(LIBGNUTLS_EXPORTS) ${librealgnutls_la_LDFLAGS}
all: all-recursive

12
security/gnutls/patches/patch-libextra_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libextra_Makefile_am,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- libextra/Makefile.am.orig Sat Dec 24 20:53:47 2005
+++ libextra/Makefile.am Sat Dec 24 20:54:33 2005
@@ -69,7 +69,7 @@ COBJECTS_EXTRA = ext_srp.c \
libgnutls_extra_la_LDFLAGS = $(LIBGNUTLS_EXTRA_EXPORTS) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ ${librealgnutls_extra_la_LDFLAGS} \
$(LIBOPENCDK_LIBS) $(LZO_LIBS)
libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \

12
security/gnutls/patches/patch-libextra_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libextra_Makefile_in,v 1.1 2005/12/24 20:52:58 sturm Exp $
--- libextra/Makefile.in.orig Sat Dec 24 21:17:52 2005
+++ libextra/Makefile.in Sat Dec 24 21:18:19 2005
@@ -345,7 +345,7 @@ COBJECTS_EXTRA = ext_srp.c \
gnutls_extra.c auth_srp_rsa.c
libgnutls_extra_la_LDFLAGS = $(LIBGNUTLS_EXTRA_EXPORTS) \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ ${librealgnutls_extra_la_LDFLAGS} \
$(LIBOPENCDK_LIBS) $(LZO_LIBS)
libgnutls_extra_la_SOURCES = $(COBJECTS_EXTRA) $(LZO_OBJECTS) \

55
security/gnutls/patches/patch-ltmain_sh
View File

@ -1,55 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.4 2005/05/11 11:16:07 robert Exp $
--- ltmain.sh.orig Wed Apr 27 23:30:16 2005
+++ ltmain.sh Tue May 10 20:07:37 2005
@@ -2270,10 +2270,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 +5824,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
;;

8
security/gnutls/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2005/05/11 11:16:07 robert Exp $
@lib lib/libgnutls-extra.so.12.25
@lib lib/libgnutls-openssl.so.12.25
@lib lib/libgnutls.so.12.25
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/24 20:52:59 sturm Exp $
@lib lib/libgnutls-extra.so.${LIBgnutls-extra_VERSION}
@lib lib/libgnutls-openssl.so.${LIBgnutls-openssl_VERSION}
@lib lib/libgnutls.so.${LIBgnutls_VERSION}