upgrade to libmng 1.0.3

This commit is contained in:
brad 2001-12-03 16:53:01 +00:00
parent 7f25084fad
commit d23bbcb381
6 changed files with 31 additions and 141 deletions

View File

@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.4 2001/11/02 21:04:56 brad Exp $ # $OpenBSD: Makefile,v 1.5 2001/12/03 16:53:01 brad Exp $
COMMENT= "Multiple-image Network Graphics (MNG) reference library" COMMENT= "Multiple-image Network Graphics (MNG) reference library"
DISTNAME= libmng-1.0.1 DISTNAME= libmng-1.0.3
CATEGORIES= graphics CATEGORIES= graphics
NEED_VERSION= 1.475 NEED_VERSION= 1.500
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libmng MASTER_SITE_SUBDIR= libmng
HOMEPAGE= http://www.libmng.com/ HOMEPAGE= http://www.libmng.com/
LIB_DEPENDS= jpeg.62::graphics/jpeg LIB_DEPENDS= jpeg.62::graphics/jpeg \
lcms::graphics/lcms
MAINTAINER= Brad Smith <brad@openbsd.org> MAINTAINER= Brad Smith <brad@openbsd.org>
@ -23,7 +24,14 @@ SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static \ CONFIGURE_ARGS+= --enable-static \
--with-jpeg="${LOCALBASE}" --without-lcms --with-jpeg="${LOCALBASE}"
CONFIGURE_ENV= CFLAGS="${CFLAGS} -DMNG_FULL_CMS" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -llcms"
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.4-ltmain_sh \
patch-*
post-install: post-install:
@cd ${WRKSRC}/doc/man && \ @cd ${WRKSRC}/doc/man && \

3
graphics/libmng/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (libmng-1.0.3.tar.gz) = 07354969078f4c46d9f6513b8fcc48c3
RMD160 (libmng-1.0.3.tar.gz) = 9b8fa23788bcc4538d4715bb6c507cb3be78651e
SHA1 (libmng-1.0.3.tar.gz) = 8e08e3849081b4fea59ebff0367255d47b9a8aa8

View File

@ -1,3 +0,0 @@
MD5 (libmng-1.0.1.tar.gz) = abfb685a0acf670a627889268ac5aa33
RMD160 (libmng-1.0.1.tar.gz) = 6b0b5de5ad7b1b566dacea4c34c86ba0b92a61fe
SHA1 (libmng-1.0.1.tar.gz) = 6cb09b1629ed0e0cfa26be81ff5ced0269093db1

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libmng_types_h,v 1.1 2001/12/03 16:53:01 brad Exp $
--- libmng_types.h.orig Mon Dec 3 10:33:46 2001
+++ libmng_types.h Mon Dec 3 10:34:40 2001
@@ -152,11 +152,7 @@
#ifndef ZLIB_DLL
#undef FAR
#endif
-#if defined(WIN32) || defined(linux) /* different header locations */
#include "lcms.h"
-#else
-#include "lcms/lcms.h"
-#endif
#endif /* MNG_INCLUDE_LCMS */
#ifdef MNG_INCLUDE_IJG6B /* IJG's jpgsrc6b */

View File

@ -1,51 +0,0 @@
--- ltconfig.orig Fri Mar 3 11:50:28 2000
+++ ltconfig Mon Feb 19 12:28:40 2001
@@ -1105,6 +1105,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1396,10 +1399,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1997,13 +2011,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*)

View File

@ -1,82 +0,0 @@
--- ltmain.sh.orig Fri Mar 3 11:50:28 2000
+++ ltmain.sh Mon Feb 19 12:30:46 2001
@@ -1079,6 +1079,17 @@
# 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
@@ -1091,6 +1102,10 @@
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3573,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
;;