summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-01-18 11:57:53 +0000
committerdrochner <drochner@pkgsrc.org>2011-01-18 11:57:53 +0000
commit73b497eae6860d9a63ea9093b570815b3a02a1db (patch)
tree683b4a614d9908b84dfa138728f55325a5fae7b2
parent571f00d17ea8e48d502898689ac7a12a473c1571 (diff)
downloadpkgsrc-73b497eae6860d9a63ea9093b570815b3a02a1db.tar.gz
resolve conflicts
-rw-r--r--graphics/giflib/DESCR3
-rw-r--r--graphics/giflib/Makefile21
-rw-r--r--graphics/giflib/PLIST3
-rw-r--r--graphics/giflib/buildlink3.mk2
-rw-r--r--graphics/giflib/distinfo6
-rw-r--r--graphics/giflib/patches/patch-aa13
6 files changed, 47 insertions, 1 deletions
diff --git a/graphics/giflib/DESCR b/graphics/giflib/DESCR
new file mode 100644
index 00000000000..7ffca8570f7
--- /dev/null
+++ b/graphics/giflib/DESCR
@@ -0,0 +1,3 @@
+giflib is a library for reading and writing gif images. It is API and ABI
+compatible with libungif which was in wide use while the LZW compression
+algorithm was patented.
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
new file mode 100644
index 00000000000..ef21feb49d4
--- /dev/null
+++ b/graphics/giflib/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.41 2011/01/18 11:57:53 drochner Exp $
+#
+
+DISTNAME= giflib-4.1.6
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=giflib/}
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://giflib.sourceforge.net/
+COMMENT= GIF image format library
+#LICENSE= # TODO: (see mk/license.mk)
+
+CONFLICTS+= libungif-[0-9]*
+PKG_DESTDIR_SUPPORT= user-destdir
+
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giflib/PLIST b/graphics/giflib/PLIST
new file mode 100644
index 00000000000..dbcf3a7ecd7
--- /dev/null
+++ b/graphics/giflib/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.4 2011/01/18 11:57:53 drochner Exp $
+include/gif_lib.h
+lib/libgif.la
diff --git a/graphics/giflib/buildlink3.mk b/graphics/giflib/buildlink3.mk
index ba684fb1f4d..fa9ca3b1d79 100644
--- a/graphics/giflib/buildlink3.mk
+++ b/graphics/giflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/18 11:53:33 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2011/01/18 11:57:53 drochner Exp $
BUILDLINK_TREE+= giflib
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
new file mode 100644
index 00000000000..56f272ee9d1
--- /dev/null
+++ b/graphics/giflib/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.6 2011/01/18 11:57:53 drochner Exp $
+
+SHA1 (giflib-4.1.6.tar.bz2) = 22680f604ec92065f04caf00b1c180ba74fb8562
+RMD160 (giflib-4.1.6.tar.bz2) = bdb99f7048a79b9e771b069f90ac151537011d19
+Size (giflib-4.1.6.tar.bz2) = 506050 bytes
+SHA1 (patch-aa) = e1d98d2b0da5773ab820db1d21d022d2df08cbbc
diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa
new file mode 100644
index 00000000000..2cb056e52b1
--- /dev/null
+++ b/graphics/giflib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.10 2011/01/18 11:57:54 drochner Exp $
+
+--- Makefile.in.orig 2007-11-10 22:53:34.000000000 +0000
++++ Makefile.in
+@@ -188,7 +188,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib util doc pic
++SUBDIRS = lib
+ WINDOWS = $(top_srcdir)/windows/GifWin.cpp \
+ $(top_srcdir)/windows/GifWin.h \
+ $(top_srcdir)/windows/StdAfx.h \