diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index b077de31d37..7d34e0dfc4b 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,21 +1,25 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2000/12/24 12:18:50 jakob Exp $ +# $OpenBSD: Makefile,v 1.2 2000/12/25 03:53:36 brad Exp $ -DISTNAME= gmp-3.1.1 -CATEGORIES= devel -NEED_VERSION= 1.341 +DISTNAME= gmp-3.1.1 +CATEGORIES= devel +NEED_VERSION= 1.341 +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= gmp -HOMEPAGE= http://www.swox.com/gmp/ +HOMEPAGE= http://www.swox.com/gmp/ -MAINTAINER= Jakob Schlyter +MAINTAINER= Jakob Schlyter PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= gmp +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static -CONFIGURE_STYLE= gnu +post-extract: + @rm -f ${WRKSRC}/gmp.info* .include diff --git a/devel/gmp/patches/patch-Makefile.in b/devel/gmp/patches/patch-Makefile.in new file mode 100644 index 00000000000..c916df90645 --- /dev/null +++ b/devel/gmp/patches/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Dec 24 20:59:48 2000 ++++ Makefile.in Sun Dec 24 20:59:56 2000 +@@ -83,7 +83,7 @@ + LN_S = @LN_S@ + M4 = @M4@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ diff --git a/devel/gmp/patches/patch-ltconfig b/devel/gmp/patches/patch-ltconfig new file mode 100644 index 00000000000..2ae5278fb8e --- /dev/null +++ b/devel/gmp/patches/patch-ltconfig @@ -0,0 +1,48 @@ +--- ltconfig.orig Mon Mar 20 07:45:00 2000 ++++ ltconfig Sun Dec 24 21:12:33 2000 +@@ -962,6 +962,9 @@ + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -1292,10 +1295,18 @@ + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ case "$host_os" in ++ openbsd2.[01234567]) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac + ;; + + os2*) +@@ -1684,13 +1695,10 @@ + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no +- fi + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH ++ deplibs_check_method='pass_all' + ;; + + os2*) diff --git a/devel/gmp/patches/patch-ltmain.sh b/devel/gmp/patches/patch-ltmain.sh new file mode 100644 index 00000000000..afbc50a9d03 --- /dev/null +++ b/devel/gmp/patches/patch-ltmain.sh @@ -0,0 +1,53 @@ +--- ltmain.sh.orig Mon Mar 20 07:45:01 2000 ++++ ltmain.sh Sun Dec 24 21:04:44 2000 +@@ -1031,6 +1031,9 @@ + $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 + fast_install=no + ;; ++ *-*-openbsd*) ++ # do not include libc due to us having libc/libc_r. ++ ;; + *) + no_install=yes + ;; +@@ -4200,40 +4203,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 + ;; + diff --git a/devel/gmp/pkg/COMMENT b/devel/gmp/pkg/COMMENT index 5830e852b8b..953e77c80bf 100644 --- a/devel/gmp/pkg/COMMENT +++ b/devel/gmp/pkg/COMMENT @@ -1 +1 @@ -Library for arbitrary precision arithmetic +library for arbitrary precision arithmetic diff --git a/devel/gmp/pkg/PLIST b/devel/gmp/pkg/PLIST index 10f58d6b3fb..d3121c0a847 100644 --- a/devel/gmp/pkg/PLIST +++ b/devel/gmp/pkg/PLIST @@ -1,12 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2000/12/24 12:18:50 jakob Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/gmp.info +@comment $OpenBSD: PLIST,v 1.2 2000/12/25 03:53:37 brad Exp $ include/gmp.h +@unexec install-info --delete --info-dir=%D/info %D/info/gmp.info info/gmp.info -info/gmp.info-1 -info/gmp.info-2 -info/gmp.info-3 -info/gmp.info-4 +@exec install-info --info-dir=%D/info %D/info/gmp.info lib/libgmp.a lib/libgmp.la %%SHARED%% -@exec install-info --info-dir=%D/info %D/info/gmp.info