diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile index f6021f06ebf..cc523bce89a 100644 --- a/devel/t1lib/Makefile +++ b/devel/t1lib/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.5 2001/06/27 13:59:26 brad Exp $ +# $OpenBSD: Makefile,v 1.6 2001/08/28 01:03:00 brad Exp $ COMMENT= "Type 1 rasterizer library for UNIX/X11" -VERSION= 1.1.1 +VERSION= 1.2 DISTNAME= t1lib-${VERSION} CATEGORIES= devel textproc -NEED_VERSION= 1.413 +NEED_VERSION= 1.435 MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= libs/graphics @@ -18,6 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} @@ -25,6 +26,6 @@ CONFIGURE_ARGS+= --enable-static ALL_TARGET= without_doc -WRKDIST= ${WRKDIR}/T1-${VERSION} +WRKDIST= ${WRKDIR}/T1Lib-${VERSION} .include diff --git a/devel/t1lib/files/md5 b/devel/t1lib/files/md5 index 01054523eeb..281ee5ceaa2 100644 --- a/devel/t1lib/files/md5 +++ b/devel/t1lib/files/md5 @@ -1,3 +1,3 @@ -MD5 (t1lib-1.1.1.tar.gz) = e42a9b9f3bff3f16c0d445304788afbe -RMD160 (t1lib-1.1.1.tar.gz) = 66da966d870e62051efea7aa6805184de7533eb7 -SHA1 (t1lib-1.1.1.tar.gz) = 5183f718dc0b90ff8c0aee4fbcfdbbc90e5db883 +MD5 (t1lib-1.2.tar.gz) = 24afebaf152307049329bd5177c43863 +RMD160 (t1lib-1.2.tar.gz) = 953cc588499e7f712591ffe36f405883e2975733 +SHA1 (t1lib-1.2.tar.gz) = b0d1755996030bbf8b51bf500c10a8273ad242ce diff --git a/devel/t1lib/patches/patch-ac-tools_ltconfig b/devel/t1lib/patches/patch-ac-tools_ltconfig index fea66f6da94..902e2334fd8 100644 --- a/devel/t1lib/patches/patch-ac-tools_ltconfig +++ b/devel/t1lib/patches/patch-ac-tools_ltconfig @@ -1,16 +1,17 @@ --- ac-tools/ltconfig.orig Mon Jan 15 15:46:31 2001 -+++ ac-tools/ltconfig Wed Jun 27 09:16:04 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) ++++ 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 -@@ -1402,10 +1405,21 @@ else + ld_shlibs=yes +@@ -1402,10 +1404,21 @@ else ;; openbsd*) @@ -26,7 +27,7 @@ + *) + 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 ++ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + export_dynamic_flag_spec='${wl}-E' + fi + ;; @@ -34,18 +35,30 @@ ;; os2*) -@@ -2021,13 +2035,10 @@ netbsd*) +@@ -2021,9 +2034,23 @@ netbsd*) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no -- fi ++ 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' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/devel/t1lib/patches/patch-doc_Makefile.in b/devel/t1lib/patches/patch-doc_Makefile.in index ff3152fd755..e935746476c 100644 --- a/devel/t1lib/patches/patch-doc_Makefile.in +++ b/devel/t1lib/patches/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Sat Mar 10 11:07:25 2001 -+++ doc/Makefile.in Sat Mar 10 11:10:16 2001 -@@ -39,6 +39,8 @@ +--- doc/Makefile.in.orig Sat May 26 05:41:35 2001 ++++ doc/Makefile.in Mon Aug 27 16:35:22 2001 +@@ -39,6 +39,8 @@ ALLCFLAGS = $(CFLAGS) $(X_CFLAGS) SUBMAKE = $(MAKE) 'CC=$(CC)' 'CFLAGS=$(ALLCFLAGS)' 'OPTIONS=$(OPTIONS)' @SET_MAKE@ @@ -9,23 +9,27 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -@@ -88,14 +90,14 @@ +@@ -91,18 +93,18 @@ clean: dummy install: dummy - if (test -f t1lib_doc.dvi) \ + if (test -f t1lib_doc.ps) \ then \ - $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \ -- $(INSTALL_DATA) t1lib_doc.dvi @T1LIB_DATA_DIR@/doc; \ -- $(INSTALL_DATA) t1_data.eps @T1LIB_DATA_DIR@/doc; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@datadir@/doc/t1lib; \ -+ $(INSTALL_DATA) t1lib_doc.dvi $(DESTDIR)@datadir@/doc/t1lib; \ -+ $(INSTALL_DATA) t1_data.eps $(DESTDIR)@datadir@/doc/t1lib; \ +- $(INSTALL_DATA) t1lib_doc.ps @T1LIB_DATA_DIR@/doc; \ ++ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++ $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ fi; if (test -f t1lib_doc.pdf) \ then \ - $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \ - $(INSTALL_DATA) t1lib_doc.pdf @T1LIB_DATA_DIR@/doc; \ -+ $(MKINSTALLDIRS) $(DESTDIR)@datadir@/doc/t1lib; \ -+ $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@datadir@/doc/t1lib; \ ++ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++ $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ fi; + uninstall: dummy +- $(RM) -R @T1LIB_DATA_DIR@/doc ++ $(RM) -R $(DESTDIR)@T1LIB_DATA_DIR@/doc + + + dummy: diff --git a/devel/t1lib/patches/patch-lib_Makefile.in b/devel/t1lib/patches/patch-lib_Makefile.in index 01a0ea348ef..e282041af19 100644 --- a/devel/t1lib/patches/patch-lib_Makefile.in +++ b/devel/t1lib/patches/patch-lib_Makefile.in @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig Mon Jan 8 02:38:36 2001 -+++ lib/Makefile.in Sat Mar 10 10:34:19 2001 -@@ -36,6 +36,8 @@ +--- lib/Makefile.in.orig Mon Jan 15 17:34:40 2001 ++++ lib/Makefile.in Mon Aug 27 16:43:46 2001 +@@ -36,6 +36,8 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ ALLCFLAGS = $(CFLAGS) @@ -9,7 +9,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -@@ -159,27 +161,27 @@ +@@ -159,27 +161,27 @@ clean: dummy install: dummy diff --git a/devel/t1lib/patches/patch-type1afm_Makefile.in b/devel/t1lib/patches/patch-type1afm_Makefile.in index adc0b631ec8..89fe7a0908e 100644 --- a/devel/t1lib/patches/patch-type1afm_Makefile.in +++ b/devel/t1lib/patches/patch-type1afm_Makefile.in @@ -1,6 +1,6 @@ ---- type1afm/Makefile.in.orig Thu Aug 31 00:54:02 2000 -+++ type1afm/Makefile.in Thu Aug 31 00:54:47 2000 -@@ -38,6 +38,8 @@ +--- type1afm/Makefile.in.orig Mon Jan 15 17:08:23 2001 ++++ type1afm/Makefile.in Mon Aug 27 16:43:46 2001 +@@ -38,6 +38,8 @@ ALLCFLAGS = $(CFLAGS) SUBMAKE = $(MAKE) 'CC=$(CC)' 'CFLAGS=$(ALLCFLAGS)' 'OPTIONS=$(OPTIONS)' @SET_MAKE@ @@ -9,7 +9,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -@@ -87,14 +89,14 @@ +@@ -87,14 +89,14 @@ clean: dummy -rmdir .libs install: dummy diff --git a/devel/t1lib/patches/patch-xglyph_Makefile.in b/devel/t1lib/patches/patch-xglyph_Makefile.in index 69aa03d9b20..48ebe8a3e7a 100644 --- a/devel/t1lib/patches/patch-xglyph_Makefile.in +++ b/devel/t1lib/patches/patch-xglyph_Makefile.in @@ -1,6 +1,6 @@ ---- xglyph/Makefile.in.orig Thu Aug 31 01:49:54 2000 -+++ xglyph/Makefile.in Thu Aug 31 01:50:34 2000 -@@ -38,6 +38,8 @@ +--- xglyph/Makefile.in.orig Mon Jan 15 17:06:53 2001 ++++ xglyph/Makefile.in Mon Aug 27 16:43:46 2001 +@@ -38,6 +38,8 @@ ALLCFLAGS = $(CFLAGS) SUBMAKE = $(MAKE) 'CC=$(CC)' 'CFLAGS=$(ALLCFLAGS)' 'OPTIONS=$(OPTIONS)' @SET_MAKE@ @@ -9,7 +9,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -@@ -94,12 +96,12 @@ +@@ -94,12 +96,12 @@ clean: dummy install: dummy diff --git a/devel/t1lib/pkg/PFRAG.shared b/devel/t1lib/pkg/PFRAG.shared index ef13c136efd..cf68e8b2274 100644 --- a/devel/t1lib/pkg/PFRAG.shared +++ b/devel/t1lib/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2001/06/27 13:59:28 brad Exp $ -lib/libt1.so.2.1 -lib/libt1x.so.2.1 +@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 DYNLIBDIR(%B) diff --git a/devel/t1lib/pkg/PLIST b/devel/t1lib/pkg/PLIST index 93e2bae258e..42d62940df0 100644 --- a/devel/t1lib/pkg/PLIST +++ b/devel/t1lib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2001/06/27 13:59:28 brad Exp $ +@comment $OpenBSD: PLIST,v 1.4 2001/08/28 01:03:00 brad Exp $ bin/type1afm bin/xglyph include/t1lib.h @@ -8,7 +8,5 @@ lib/libt1.la lib/libt1x.a lib/libt1x.la %%SHARED%% -share/doc/t1lib/t1lib_doc.pdf share/t1lib/t1lib.config @dirrm share/t1lib -@dirrm share/doc/t1lib