From 9bd9e1cbdf893d1c22b06da2679bcfd898910659 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 11 Nov 2001 01:40:54 +0000 Subject: [PATCH] bye bye, stub this out. --- graphics/giflib/Makefile | 38 +------ graphics/giflib/files/md5 | 18 ---- graphics/giflib/patches/patch-lib_Makefile_in | 12 --- graphics/giflib/patches/patch-ltconfig | 62 ----------- graphics/giflib/patches/patch-ltmain_sh | 101 ------------------ graphics/giflib/pkg/DESCR | 11 -- graphics/giflib/pkg/PFRAG.no-no_x11 | 2 - graphics/giflib/pkg/PFRAG.shared | 3 - graphics/giflib/pkg/PLIST | 35 ------ 9 files changed, 3 insertions(+), 279 deletions(-) delete mode 100644 graphics/giflib/files/md5 delete mode 100644 graphics/giflib/patches/patch-lib_Makefile_in delete mode 100644 graphics/giflib/patches/patch-ltconfig delete mode 100644 graphics/giflib/patches/patch-ltmain_sh delete mode 100644 graphics/giflib/pkg/DESCR delete mode 100644 graphics/giflib/pkg/PFRAG.no-no_x11 delete mode 100644 graphics/giflib/pkg/PFRAG.shared delete mode 100644 graphics/giflib/pkg/PLIST diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 9c05d9298c4..7836d2d59d8 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,43 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2001/08/21 19:36:08 brad Exp $ +# $OpenBSD: Makefile,v 1.19 2001/11/11 01:40:54 brad Exp $ COMMENT= "GIF library and utilities" -DISTNAME= giflib-4.1.0 +PKGNAME= giflib CATEGORIES= graphics -NEED_VERSION= 1.435 -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITES0= ${MASTER_SITE_BACKUP} -MASTER_SITE_SUBDIR= libs/giflib - -PATCHFILES= giflib-4.1.0-19990224.patch.gz:0 \ - giflib-4.1.0-19990305.patch.gz:0 \ - giflib-4.1.0-19990322.patch.gz:0 \ - giflib-4.1.0-19990415.patch.gz:0 \ - giflib-4.1.0-19990523.patch.gz:0 -PATCH_DIST_STRIP= -p1 +IGNORE= "has been superseded by libungif" MAINTAINER= Brad Smith -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -USE_GMAKE= Yes -SYSCONFDIR= ${PREFIX}/lib -SEPARATE_BUILD= concurrent -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static - -FLAVORS= no_x11 -FLAVOR?= - -.if ${FLAVOR:L} == "no_x11" -CONFIGURE_ARGS+= --without-x -.else -USE_X11= Yes -CONFIGURE_ARGS+= --with-x -.endif - .include diff --git a/graphics/giflib/files/md5 b/graphics/giflib/files/md5 deleted file mode 100644 index 8eb88393926..00000000000 --- a/graphics/giflib/files/md5 +++ /dev/null @@ -1,18 +0,0 @@ -MD5 (giflib-4.1.0-19990224.patch.gz) = 02710e0fae02eadcef1a9984126bdea7 -MD5 (giflib-4.1.0-19990305.patch.gz) = dbcfdbffd0eb78c0ead2a6d17ce39aed -MD5 (giflib-4.1.0-19990322.patch.gz) = 10a2addcc77dc530be079b02cfd21549 -MD5 (giflib-4.1.0-19990415.patch.gz) = 6befb1f989870850d8c4460a541a3f7f -MD5 (giflib-4.1.0-19990523.patch.gz) = 8a31f390bf2e4ee9363852fcaf5c65ea -MD5 (giflib-4.1.0.tar.gz) = f70e8fe2dd57815bd2740aa88aa32f2c -RMD160 (giflib-4.1.0-19990224.patch.gz) = bcef4b9f5587e30296126981a2bad45e596f56f4 -RMD160 (giflib-4.1.0-19990305.patch.gz) = 111c4d7e91bcbd21438cba32c00571c8cf16c482 -RMD160 (giflib-4.1.0-19990322.patch.gz) = a00d8983a3178e056df629b785a1f967f663cc67 -RMD160 (giflib-4.1.0-19990415.patch.gz) = abc091f233a5bf92724854a21ef40d710782f1c5 -RMD160 (giflib-4.1.0-19990523.patch.gz) = 01f8b918e8a85d7e8c73241efe57c29d2abdf2bd -RMD160 (giflib-4.1.0.tar.gz) = 539793899cfbd866df862143c3a158a62de9a663 -SHA1 (giflib-4.1.0-19990224.patch.gz) = 6e7bed15b025312411945fc3b6cfc3bda5a38db7 -SHA1 (giflib-4.1.0-19990305.patch.gz) = b2b8297a275fe45ab985d4c383da0a889c44cb8f -SHA1 (giflib-4.1.0-19990322.patch.gz) = b9acfc332862fa92cc15d122d43104c159c6c5d0 -SHA1 (giflib-4.1.0-19990415.patch.gz) = a3e2d1ae8ad563148eae2fc5a873e571b1fee076 -SHA1 (giflib-4.1.0-19990523.patch.gz) = e1cdd2832e4fe66a6b71ddff4b137830bdf1208f -SHA1 (giflib-4.1.0.tar.gz) = d282070e7fda813c87789d4b31b61ac8afeccc3c diff --git a/graphics/giflib/patches/patch-lib_Makefile_in b/graphics/giflib/patches/patch-lib_Makefile_in deleted file mode 100644 index b0d820d549e..00000000000 --- a/graphics/giflib/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1 2001/02/20 22:07:48 danh Exp $ ---- lib/Makefile.in.orig Wed Feb 10 01:49:56 1999 -+++ lib/Makefile.in Tue Feb 20 16:53:37 2001 -@@ -97,7 +97,7 @@ libgif_la_SOURCES = dev2gif.c \ - quantize.c \ - gif_lib_private.h - --libgif_la_LDFLAGS = -version-info 5:0:1 -+libgif_la_LDFLAGS = -version-info 4:1:0 - libgif_la_LIBADD = @DEVS@ - CFLAGS = @CFLAGS@ $(X_CFLAGS) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/graphics/giflib/patches/patch-ltconfig b/graphics/giflib/patches/patch-ltconfig deleted file mode 100644 index eab8f400492..00000000000 --- a/graphics/giflib/patches/patch-ltconfig +++ /dev/null @@ -1,62 +0,0 @@ -$OpenBSD: patch-ltconfig,v 1.1 2001/02/20 22:07:48 danh Exp $ ---- ltconfig.orig Tue Feb 20 17:01:27 2001 -+++ ltconfig Tue Feb 20 17:06:36 2001 -@@ -740,6 +740,13 @@ hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - runpath_var= - -+case "$host_os" in -+openbsd*) -+ with_gnu_ld=no -+ ;; -+ -+esac -+ - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - -@@ -865,10 +872,21 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib$libobjs' -- 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*) -@@ -1216,11 +1234,19 @@ linux-gnu*) - fi - ;; - --netbsd* | openbsd*) -+netbsd*) -+ version_type=sunos -+ library_names_spec='${libname}${release}.so$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+openbsd*) - version_type=sunos - library_names_spec='${libname}${release}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/graphics/giflib/patches/patch-ltmain_sh b/graphics/giflib/patches/patch-ltmain_sh deleted file mode 100644 index e5a4bf24423..00000000000 --- a/graphics/giflib/patches/patch-ltmain_sh +++ /dev/null @@ -1,101 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 22:07:48 danh Exp $ ---- ltmain.sh.orig Thu Sep 10 03:42:47 1998 -+++ ltmain.sh Tue Feb 20 17:06:50 2001 -@@ -537,7 +537,28 @@ if test -z "$show_help"; then - deplibs="$deplibs $arg" - ;; - -- -l*) deplibs="$deplibs $arg" ;; -+ -l*) -+ if test "$arg" = "-lc"; then -+ case "$host" in -+ *-*-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 -+ fi -+ deplibs="$deplibs $arg" -+ ;; -+ -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; - - -no-undefined) - allow_undefined=no -@@ -1056,9 +1077,23 @@ if test -z "$show_help"; then - allow_undefined_flag="$no_undefined_flag" - fi - -- # Add libc to deplibs on all systems. -- dependency_libs="$deplibs" -- deplibs="$deplibs -lc" -+ dependency_libs="$deplibs" -+ case "$host" in -+ *-*-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. -+ ;; -+ *-*-rhapsody*) -+ # rhapsody is a little odd... -+ deplibs="$deplibs -framework System" -+ ;; -+ *) -+ # Add libc to deplibs on all other systems. -+ deplibs="$deplibs -lc" -+ ;; -+ esac - fi - - # Create the output directory, or remove our outputs if we need to. -@@ -2162,40 +2197,6 @@ libdir='$install_libdir'\ - done - fi - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "To link against installed libraries in a given directory, LIBDIR," -- echo "you must use the \`-LLIBDIR' flag during linking." -- echo -- echo " You will also need to 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/graphics/giflib/pkg/DESCR b/graphics/giflib/pkg/DESCR deleted file mode 100644 index 412e2eaf508..00000000000 --- a/graphics/giflib/pkg/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -This package has been released under an X Consortium-life freeware -license. Use and copy as you see fit. If you make useful changes, add -new tools, or find and fix bugs, please send your mods to the -maintainers for general distribution. -The util directory includes programs to clip, rotate, scale, and -position GIF images. It includes an X11 viewer, code to dump GIFs to -an Epson-compatible printer in graphics mode, and many conversion -utilities. These are no replacement for an interactive graphics -editor, but they can be very useful for scripted image generation or -transformation. - diff --git a/graphics/giflib/pkg/PFRAG.no-no_x11 b/graphics/giflib/pkg/PFRAG.no-no_x11 deleted file mode 100644 index 47194dd1716..00000000000 --- a/graphics/giflib/pkg/PFRAG.no-no_x11 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/08/03 23:44:36 brad Exp $ -bin/gif2x11 diff --git a/graphics/giflib/pkg/PFRAG.shared b/graphics/giflib/pkg/PFRAG.shared deleted file mode 100644 index 60f279630d6..00000000000 --- a/graphics/giflib/pkg/PFRAG.shared +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 02:09:21 krw Exp $ -lib/libgif.so.4.1 -DYNLIBDIR(%B) diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST deleted file mode 100644 index 0c550f0fbb9..00000000000 --- a/graphics/giflib/pkg/PLIST +++ /dev/null @@ -1,35 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.6 2001/11/02 21:22:08 brad Exp $ -@pkgcfl libungif-[0-9]* -bin/gif2epsn -bin/gif2ps -bin/gif2rgb -bin/gifasm -bin/gifbg -bin/gifclip -bin/gifcomb -bin/giffix -bin/gifflip -bin/gifhisto -bin/gifinter -bin/gifinto -bin/gifovly -bin/gifpos -bin/gifrsize -bin/giftext -bin/gifwedge -bin/raw2gif -bin/rgb2gif -bin/text2gif -bin/gifspnge -bin/giffiltr -bin/icon2gif -bin/gifcolor -bin/gifclrmp -bin/gifrotat -!%%no_x11%% -bin/gifcompose -bin/gifburst -include/gif_lib.h -lib/libgif.a -lib/libgif.la -%%SHARED%%