upgrade to t1lib 1.3.1

This commit is contained in:
brad 2001-11-29 15:16:14 +00:00
parent eaa1b9c46a
commit 99f063c171
6 changed files with 19 additions and 157 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:13 pvalchev Exp $
# $OpenBSD: Makefile,v 1.8 2001/11/29 15:16:14 brad Exp $
COMMENT= "Type 1 rasterizer library for UNIX/X11"
VERSION= 1.2
VERSION= 1.3.1
DISTNAME= t1lib-${VERSION}
CATEGORIES= devel textproc
NEED_VERSION= 1.435
NEED_VERSION= 1.489
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
@ -21,12 +21,20 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-tools
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-tools
NO_REGRESS= Yes
ALL_TARGET= without_doc
WRKDIST= ${WRKDIR}/T1Lib-${VERSION}
post-patch:
@cd ${WRKSRC}/ac-tools; \
${PATCH} --forward --quiet -E < \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig && \
${PATCH} --forward --quiet -E < \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh
.include <bsd.port.mk>

3
devel/t1lib/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (t1lib-1.3.1.tar.gz) = bce5051f2ad068af49d44cf6203e22ce
RMD160 (t1lib-1.3.1.tar.gz) = c45bb3ca5170c55e841132bacc9b2ee049ef723f
SHA1 (t1lib-1.3.1.tar.gz) = 01fba5a0c9249e69e6fd41d24641e85d17e94a26

View File

@ -1,3 +0,0 @@
MD5 (t1lib-1.2.tar.gz) = 24afebaf152307049329bd5177c43863
RMD160 (t1lib-1.2.tar.gz) = 953cc588499e7f712591ffe36f405883e2975733
SHA1 (t1lib-1.2.tar.gz) = b0d1755996030bbf8b51bf500c10a8273ad242ce

View File

@ -1,64 +0,0 @@
--- ac-tools/ltconfig.orig Mon Jan 15 15:46:31 2001
+++ ac-tools/ltconfig Mon Aug 27 18:47:51 2001
@@ -1105,7 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
ld_shlibs=yes
@@ -1402,10 +1404,21 @@ else
;;
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 test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2021,9 +2034,23 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'

View File

@ -1,82 +0,0 @@
--- ac-tools/ltmain.sh.orig Mon Jan 15 15:48:25 2001
+++ ac-tools/ltmain.sh Wed Jun 27 09:16:04 2001
@@ -1079,6 +1079,17 @@ compiler."
# 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 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# 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
;;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/08/28 01:03:00 brad Exp $
lib/libt1.so.3.0
lib/libt1x.so.3.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2001/11/29 15:16:14 brad Exp $
lib/libt1.so.4.1
lib/libt1x.so.4.1
DYNLIBDIR(%B)