- cleanup Makefile
- remove USE_LIBTOOL - sync patch-ltconfig with my original patch - add missing patch-ltmain.sh - fixup PLISTs
This commit is contained in:
parent
647a646f17
commit
ce5ed433c2
@ -1,23 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2000/12/14 17:37:40 brad Exp $
|
||||
|
||||
DISTNAME= libmcrypt-2.4.7
|
||||
CATEGORIES= security
|
||||
NEED_VERSION= 1.340
|
||||
DISTNAME= libmcrypt-2.4.7
|
||||
CATEGORIES= security
|
||||
NEED_VERSION= 1.340
|
||||
MASTER_SITES= http://mcrypt.hellug.gr/lib/ \
|
||||
ftp://argeas.cs-net.gr/pub/unix/mcrypt
|
||||
|
||||
HOMEPAGE= http://mcrypt.hellug.gr/lib/
|
||||
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
|
||||
HOMEPAGE= http://mcrypt.hellug.gr/lib/
|
||||
|
||||
LIB_DEPENDS= mhash.2:security/mhash
|
||||
|
||||
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
LIB_DEPENDS= mhash.2:security/mhash
|
||||
|
||||
MASTER_SITES= http://mcrypt.hellug.gr/lib/ \
|
||||
ftp://argeas.cs-net.gr/pub/unix/mcrypt
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+= --enable-static
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,7 +1,6 @@
|
||||
$OpenBSD: patch-ltconfig,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
--- ltconfig.orig Sun Nov 19 16:12:40 2000
|
||||
+++ ltconfig Sun Nov 19 16:21:47 2000
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
--- ltconfig.orig Sat Oct 21 04:39:25 2000
|
||||
+++ ltconfig Thu Dec 14 11:44:23 2000
|
||||
@@ -1105,6 +1105,9 @@
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
@ -11,7 +10,7 @@ $OpenBSD: patch-ltconfig,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
|
||||
esac
|
||||
|
||||
@@ -1402,10 +1405,18 @@ else
|
||||
@@ -1402,10 +1405,18 @@
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
@ -32,15 +31,7 @@ $OpenBSD: patch-ltconfig,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -1922,7 +1933,6 @@ gnu*)
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
|
||||
soname_spec='${libname}${release}.so$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
- deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
@@ -2022,13 +2032,10 @@ netbsd*)
|
||||
@@ -2022,13 +2033,10 @@
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
|
53
security/libmcrypt/patches/patch-ltmain.sh
Normal file
53
security/libmcrypt/patches/patch-ltmain.sh
Normal file
@ -0,0 +1,53 @@
|
||||
--- ltmain.sh.orig Sat Oct 21 04:39:25 2000
|
||||
+++ ltmain.sh Thu Dec 14 11:44:26 2000
|
||||
@@ -1799,6 +1799,9 @@
|
||||
# rhapsody is a little odd...
|
||||
deplibs="$deplibs -framework System"
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems.
|
||||
deplibs="$deplibs -lc"
|
||||
@@ -3567,40 +3570,6 @@
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
|
||||
- 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 \`-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 0
|
||||
;;
|
||||
|
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/12/14 17:37:41 brad Exp $
|
||||
lib/libmcrypt.so.4.4
|
||||
DYNLIBDIR(%B)
|
||||
lib/libmcrypt/libarcfour-iv.so.0.0
|
||||
lib/libmcrypt/libarcfour.so.0.0
|
||||
lib/libmcrypt/libblowfish.so.0.0
|
||||
@ -29,5 +30,4 @@ lib/libmcrypt/libtripledes.so.0.0
|
||||
lib/libmcrypt/libtwofish.so.0.0
|
||||
lib/libmcrypt/libwake.so.0.0
|
||||
lib/libmcrypt/libxtea.so.0.0
|
||||
DYNLIBDIR(%D/lib)
|
||||
NEWDYNLIBDIR(%D/lib/libmcrypt)
|
||||
NEWDYNLIBDIR(%B)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2000/11/27 15:41:46 avsm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2000/12/14 17:37:41 brad Exp $
|
||||
include/mcrypt.h
|
||||
lib/libmcrypt.a
|
||||
lib/libmcrypt.la
|
||||
@ -60,6 +60,6 @@ lib/libmcrypt/tripledes.la
|
||||
lib/libmcrypt/twofish.la
|
||||
lib/libmcrypt/wake.la
|
||||
lib/libmcrypt/xtea.la
|
||||
man/man3/mcrypt.3
|
||||
%%SHARED%%
|
||||
man/man3/mcrypt.3
|
||||
@dirrm lib/libmcrypt
|
||||
|
Loading…
Reference in New Issue
Block a user