Update to 2.2.2

Respect NOPORTDOCS
Update maintainer's email

PR:		34335
Submitted by:	maintainer

5 files changed, 47 insertions, 27 deletions

diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 25a04de2d17c..ad1802e43814 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -6,15 +6,21 @@
 #
 
 PORTNAME=	giblib
-PORTVERSION=	1.2.1
-CATEGORIES=	graphics
+PORTVERSION=	1.2.2
+CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 
-MAINTAINER=	ishmael27@home.com
+MAINTAINER=	ishmael27x@yahoo.com
 
 LIB_DEPENDS=	Imlib2.1:${PORTSDIR}/graphics/imlib2
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+INSTALLS_SHLIB=	yes
+
+.if defined(NOPORTDOCS)
+MAKE_ENV=	NO_DOC=yes
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/giblib/distinfo b/graphics/giblib/distinfo
index a806c43f3d28..872e20a5ef0d 100644
--- a/graphics/giblib/distinfo
+++ b/graphics/giblib/distinfo
@@ -1 +1 @@
-MD5 (giblib-1.2.1.tar.gz) = 3bc962ba187d78ff4d2e3a1475f2febd
+MD5 (giblib-1.2.2.tar.gz) = 8de287688cc5ec3681d8ab1c7846e302
diff --git a/graphics/giblib/files/patch-aa b/graphics/giblib/files/patch-aa
index bd361dfeb9ac..8c34a4bd7d7b 100644
--- a/graphics/giblib/files/patch-aa
+++ b/graphics/giblib/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Nov 10 09:03:22 2000
-+++ Makefile.in	Sun Nov 12 14:39:59 2000
-@@ -76,7 +76,7 @@
+--- Makefile.in.orig	Sat Jan 26 10:05:59 2002
++++ Makefile.in	Sun Jan 27 10:27:32 2002
+@@ -84,7 +84,7 @@
  SUBDIRS = giblib
  
  docs_DATA = README AUTHORS ChangeLog TODO
@@ -9,3 +9,19 @@
  
  EXTRA_DIST = $(docs_DATA)
  
+@@ -174,6 +174,7 @@
+ 	done
+ 
+ install-docsDATA: $(docs_DATA)
++.if !defined(NO_DOC)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(docsdir)
+ 	@list='$(docs_DATA)'; for p in $$list; do \
+@@ -185,6 +186,7 @@
+ 	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \
+ 	  fi; fi; \
+ 	done
++.endif
+ 
+ uninstall-docsDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/giblib/files/patch-ltmain.sh b/graphics/giblib/files/patch-ltmain.sh
index 98cb05e4ddb3..38b92015addd 100644
--- a/graphics/giblib/files/patch-ltmain.sh
+++ b/graphics/giblib/files/patch-ltmain.sh
@@ -1,19 +1,16 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+--- ltmain.sh.orig	Wed Jan  9 13:26:41 2002
++++ ltmain.sh	Sat Jan 26 10:40:27 2002
+@@ -2359,6 +2359,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=""
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -4247,10 +4250,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/graphics/giblib/pkg-plist b/graphics/giblib/pkg-plist
index 2f6804aea801..a655caccee0a 100644
--- a/graphics/giblib/pkg-plist
+++ b/graphics/giblib/pkg-plist
@@ -1,10 +1,11 @@
+@comment $FreeBSD$
 bin/giblib-config
-include/giblib/gib_btree.h                                                    
-include/giblib/gib_hash.h                                                    
+include/giblib/gib_btree.h
+include/giblib/gib_hash.h
 include/giblib/gib_imlib.h
 include/giblib/gib_list.h
-include/giblib/gib_queue.h                                                    
-include/giblib/gib_stack.h                                                    
+include/giblib/gib_queue.h
+include/giblib/gib_stack.h
 include/giblib/gib_style.h
 include/giblib/gib_utils.h
 include/giblib/giblib.h
@@ -12,9 +13,9 @@ include/giblib/giblib_config.h
 lib/libgiblib.a
 lib/libgiblib.so
 lib/libgiblib.so.1
-share/doc/giblib/AUTHORS
-share/doc/giblib/ChangeLog
-share/doc/giblib/README
-share/doc/giblib/TODO
+%%PORTDOCS%%share/doc/giblib/AUTHORS
+%%PORTDOCS%%share/doc/giblib/ChangeLog
+%%PORTDOCS%%share/doc/giblib/README
+%%PORTDOCS%%share/doc/giblib/TODO
 @dirrm include/giblib
-@dirrm share/doc/giblib
+%%PORTDOCS%%@dirrm share/doc/giblib