5 files changed, 21 insertions, 64 deletions
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index f2e4db25dff9..cb04468644fb 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	giblib
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 
@@ -16,12 +16,20 @@ COMMENT=	A utility library that includes a wrapper for imlib2
 LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
 
-.if defined(NOPORTDOCS)
-MAKE_ENV=	NO_DOC=yes
+post-patch:
+	@${REINPLACE_CMD} -e 's|: install-docsDATA|:|g' ${WRKSRC}/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS ChangeLog README TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/giblib/distinfo b/graphics/giblib/distinfo
index 96fbed6fe168..5d2f1a4d400d 100644
--- a/graphics/giblib/distinfo
+++ b/graphics/giblib/distinfo
@@ -1,2 +1,2 @@
-MD5 (giblib-1.2.3.tar.gz) = 06ae3113fdfe9f05a642bd844cc85eab
-SIZE (giblib-1.2.3.tar.gz) = 185190
+MD5 (giblib-1.2.4.tar.gz) = c810ef5389baf24882a1caca2954385e
+SIZE (giblib-1.2.4.tar.gz) = 287653
diff --git a/graphics/giblib/files/patch-aa b/graphics/giblib/files/patch-aa
deleted file mode 100644
index 8c34a4bd7d7b..000000000000
--- a/graphics/giblib/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
--docsdir = $(prefix)/doc/giblib
-+docsdir = $(datadir)/doc/giblib
- 
- 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
deleted file mode 100644
index 38b92015addd..000000000000
--- a/graphics/giblib/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -4247,10 +4250,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/giblib/pkg-plist b/graphics/giblib/pkg-plist
index d9f3d64825da..b7f4e7e81451 100644
--- a/graphics/giblib/pkg-plist
+++ b/graphics/giblib/pkg-plist
@@ -14,9 +14,10 @@ include/giblib/giblib_config.h
 lib/libgiblib.a
 lib/libgiblib.so
 lib/libgiblib.so.1
-%%PORTDOCS%%share/doc/giblib/AUTHORS
-%%PORTDOCS%%share/doc/giblib/ChangeLog
-%%PORTDOCS%%share/doc/giblib/README
-%%PORTDOCS%%share/doc/giblib/TODO
+libdata/pkgconfig/giblib.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/giblib
-%%PORTDOCS%%@dirrm share/doc/giblib