- fix offline build

Submitted by:	Oliver Pinter

- fix option NOPORTDOCS

- fix QuantizeBuffer
Submitted by:	Greg Lewis

3 files changed, 36 insertions, 7 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 29bdb25481fe..bd6d98b0857b 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giflib
 PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x
 PKGNAMESUFFIX=	${NOX11SUFFIX}${PKGNAMESUFFIX2}
@@ -15,8 +15,6 @@ PKGNAMESUFFIX=	${NOX11SUFFIX}${PKGNAMESUFFIX2}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 
-BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
-
 CONFLICTS=	libungif-[0-9]*
 
 USE_BZIP2=	yes
@@ -24,6 +22,12 @@ USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
+.endif
+
 .if defined(WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
 CONFIGURE_ARGS+=	--with-x=no
@@ -34,8 +38,14 @@ PLIST_SUB+=	X11=''
 CPPFLAGS+=	-I${LOCALBASE}/include
 .endif
 
-post_patch:
+post-patch:
 	${CP} ${FILESDIR}/quantize.c ${WRKSRC}/lib/
+	${REINPLACE_CMD} -e 's|xmlto |xmlto --skip-validation |' \
+		${WRKSRC}/doc/Makefile.in
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
+		${WRKSRC}/Makefile.in
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -44,4 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/giflib/files/patch-Makefile.in b/graphics/giflib/files/patch-Makefile.in
index e0bc0b66096b..4238078c379b 100644
--- a/graphics/giflib/files/patch-Makefile.in
+++ b/graphics/giflib/files/patch-Makefile.in
@@ -1,5 +1,14 @@
---- lib/Makefile.in.orig	2012-05-17 02:59:23.000000000 +0200
-+++ lib/Makefile.in	2012-06-03 12:16:01.000000000 +0200
+--- lib/Makefile.in.orig	2012-05-16 17:59:23.000000000 -0700
++++ lib/Makefile.in	2012-06-03 22:25:28.000000000 -0700
+@@ -77,7 +77,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libgif_la_DEPENDENCIES =
+ am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
+-	gifalloc.lo gif_err.lo
++	gifalloc.lo gif_err.lo quantize.lo
+ libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
+ libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 @@ -234,6 +234,7 @@
  					gif_hash.h	\
                      gifalloc.c  \
@@ -8,3 +17,11 @@
  					gif_lib_private.h
  
  libgif_la_LDFLAGS = -version-info @SHLIBVERSION@
+@@ -319,6 +320,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/graphics/giflib/files/quantize.c b/graphics/giflib/files/quantize.c
index 1cbb41f30870..fdcfe36efb93 100644
--- a/graphics/giflib/files/quantize.c
+++ b/graphics/giflib/files/quantize.c
@@ -29,6 +29,8 @@
 
 #define ABS(x)    ((x) > 0 ? (x) : (-(x)))
 
+#define PROGRAM_NAME	"giflib"
+
 /* The colors are stripped to 5 bits per primary color if non MSDOS system
  * or to 4 (not enough memory...) if MSDOS as first step.
  */