Update to version 0.91

PR: 33790
Submitted by: Ports Fury

4 files changed, 147 insertions, 43 deletions

diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 9da4e4b7ffa3..018216caa1f4 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libafterimage
-PORTVERSION=	0.81
+PORTVERSION=	0.91
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
@@ -15,34 +15,41 @@ DISTNAME=	libAfterImage-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png \
-		ungif:${PORTSDIR}/graphics/libungif \
-		tiff:${PORTSDIR}/graphics/tiff \
-		freetype:${PORTSDIR}/print/freetype2 \
-		AfterBase:${PORTSDIR}/devel/libafterbase
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
+LIB_DEPENDS=	AfterBase.0:${PORTSDIR}/devel/libafterbase \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		freetype.7:${PORTSDIR}/print/freetype2
+
+WRKSRC=		${WRKDIR}/libAfterImage
 
 USE_X_PREFIX=	yes
-FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV= \
-	CPPFLAGS="${CXXFLAGS} `${FREETYPE_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \
-	LIBS="`${FREETYPE_CONFIG} --libs`"
-CONFIGURE_ARGS=	--enable-sharedlibs --with-x
-WRKSRC=		${WRKDIR}/libAfterImage
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--enable-sharedlibs --with-builtin-xpm --with-x
 INSTALLS_SHLIB=	yes
 
-MANCOMPRESSED=	no
-MAN3=	afterimage.3x asfont.3x asimage.3x asvisual.3x blender.3x import.3x
+MAN1=	ascompose.1x
+MAN3=	afterimage.3x ascmap.3x asfont.3x asimage.3x asvisual.3x blender.3x \
+	export.3x import.3x transform.3x ximage.3x
 
-post-patch:
-	@${PERL} -pi -e "s,\@CFLAGS\@,\@CPPFLAGS\@,g" ${WRKSRC}/Makefile.in
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MMX) && (${ARCH} == "i386")
+CONFIGURE_ARGS+=	--enable--mmx-optimization
+.endif
 
-pre-install:
-	@${TOUCH} ${WRKSRC}/doc/export.man
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET=	install install.doc
+.endif
 
-post-install:
-	@${MV} -f ${PREFIX}/lib/libAfterImage.so.0.81 ${PREFIX}/lib/libAfterImage.so.0
-	@${RM} -f ${MAN3PREFIX}/man/man3/export.3x
+post-patch:
+	@${PERL} -pi -e 's|-lgif|-lungif|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+		's|<malloc.h>|<stdlib.h>|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/libafterimage/distinfo b/graphics/libafterimage/distinfo
index 48c9c759452d..f33d74b50355 100644
--- a/graphics/libafterimage/distinfo
+++ b/graphics/libafterimage/distinfo
@@ -1 +1 @@
-MD5 (libAfterImage-0.81.tar.gz) = 0b13bba07f9b1f7e42cd0c9713517b10
+MD5 (libAfterImage-0.91.tar.gz) = 4c6cfaacbc055ed9b58a434aed7eb741
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
new file mode 100644
index 000000000000..f2c09142ae64
--- /dev/null
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -0,0 +1,82 @@
+--- Makefile.in.orig	Thu Jan 10 15:42:13 2002
++++ Makefile.in	Sat Jan 12 02:44:01 2002
+@@ -47,7 +47,7 @@
+ MV		= @MV@
+ RM		= @RM@
+ RMF		= @RM@ -f
+-MKDIR		= @MKDIR@
++MKDIR		= @MKDIR@ -p
+ FIND		= @FIND@
+ XARGS		= @XARGS@
+ LDCONFIG	= @LDCONFIG@
+@@ -59,11 +59,11 @@
+ LEXFLAGS	=
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL@ -s -m 755
+-INSTALL_DATA	= @INSTALL@ -m 644
+-INSTALL_HEADER	= @INSTALL@ -m 644
+-INSTALL_LIB	= @INSTALL@ -m 755
+-INSTALL_SCRIPT	= @INSTALL@ -m 755
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@
++INSTALL_DATA	= @INSTALL_DATA@
++INSTALL_HEADER	= @INSTALL_DATA@
++INSTALL_LIB	= @INSTALL_DATA@
++INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+ 
+ INCS_EXTRA	= @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @TTF_INCLUDES@
+ INCS_X		= @X_CFLAGS@
+@@ -79,7 +79,7 @@
+ AFTER_MAN_DIR	= @mandir@/man3
+ AFTER_APP_MAN_DIR	= @mandir@/man1
+ AFTER_SHAREDIR	= @datadir@/libAfterImage
+-AFTER_DOC_DIR	= $(AFTER_SHAREDIR)/doc
++AFTER_DOC_DIR	= @datadir@/doc/libAfterImage
+ 
+ all:            @LIBPROG@ $(INSTALLONBUILD) apps
+ 
+@@ -111,10 +111,9 @@
+ install.script:
+ 
+ install.dyn:
+-		$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)
++		$(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)
+ 		$(INSTALL_SCRIPT) afterimage-libs $(AFTER_BIN_DIR)
+-		-@/bin/rm -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED)
+-		ln -sf $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR)
++		-@/bin/rm -f $(LIBDIR)/$(LIB_SHARED)
+ 		ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED)
+ 		@( \
+ 		 if test `uname` = "Linux"; then \
+@@ -257,11 +256,8 @@
+ $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
+ 	ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
+ 
+-$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
+-	ln -sf $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+-
+-$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_OBJS) $(LIB_INCS) config.h
++	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \
+ 	 $(LIB_OBJS)
+ 
+ doc.xref: $(LIB_DOCS)
+@@ -307,8 +303,6 @@
+ 
+ install.doc:
+ 	SRCS=`echo "$(LIB_DOCS) " | sed "s/.h / /g"`; cd doc/html; \
+-	    echo "$(MKDIR) $(AFTER_SHAREDIR)"; \
+-		$(MKDIR) $(AFTER_SHAREDIR); \
+ 	    echo "$(MKDIR) $(AFTER_DOC_DIR)"; \
+ 		$(MKDIR) $(AFTER_DOC_DIR); \
+ 	    echo "$(MKDIR) $(AFTER_DOC_DIR)/html"; \
+@@ -318,7 +312,7 @@
+ 		  $(INSTALL_DATA) $$f $(AFTER_DOC_DIR)/html/$$f; \
+ 		done; cd ../..;
+ 
+-install:	install.lib install.man install.doc install.apps
++install:	install.lib install.man install.apps
+ 
+ 
+ uninstall:	uninstall.lib
diff --git a/graphics/libafterimage/pkg-plist b/graphics/libafterimage/pkg-plist
index a61bf2aa5b69..6c1ba8d69861 100644
--- a/graphics/libafterimage/pkg-plist
+++ b/graphics/libafterimage/pkg-plist
@@ -1,6 +1,15 @@
 bin/afterimage-libs
+bin/ascompose
+bin/asflip
+bin/asgrad
+bin/asmerge
+bin/asscale
+bin/astext
+bin/astile
+bin/asview
 include/libAfterImage/afterbase.h
 include/libAfterImage/afterimage.h
+include/libAfterImage/ascmap.h
 include/libAfterImage/asfont.h
 include/libAfterImage/asimage.h
 include/libAfterImage/asvisual.h
@@ -8,27 +17,33 @@ include/libAfterImage/blender.h
 include/libAfterImage/config.h
 include/libAfterImage/export.h
 include/libAfterImage/import.h
+include/libAfterImage/transform.h
+include/libAfterImage/ungif.h
 include/libAfterImage/xcf.h
+include/libAfterImage/ximage.h
 include/libAfterImage/xpm.h
-@dirrm include/libAfterImage
 lib/libAfterImage.a
 lib/libAfterImage.so
 lib/libAfterImage.so.0
-share/libAfterImage/doc/html/afterimage.html
-share/libAfterImage/doc/html/asflip.html
-share/libAfterImage/doc/html/asfont.html
-share/libAfterImage/doc/html/asgrad.html
-share/libAfterImage/doc/html/asimage.html
-share/libAfterImage/doc/html/asmerge.html
-share/libAfterImage/doc/html/asscale.html
-share/libAfterImage/doc/html/astext.html
-share/libAfterImage/doc/html/astile.html
-share/libAfterImage/doc/html/asview.html
-share/libAfterImage/doc/html/asvisual.html
-share/libAfterImage/doc/html/blender.html
-share/libAfterImage/doc/html/common.html
-share/libAfterImage/doc/html/export.html
-share/libAfterImage/doc/html/import.html
-@dirrm share/libAfterImage/doc/html
-@dirrm share/libAfterImage/doc
-@dirrm share/libAfterImage
+%%PORTDOCS%%share/doc/libAfterImage/html/afterimage.html
+%%PORTDOCS%%share/doc/libAfterImage/html/ascmap.html
+%%PORTDOCS%%share/doc/libAfterImage/html/ascompose.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asflip.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asfont.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asgrad.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asimage.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asmerge.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asscale.html
+%%PORTDOCS%%share/doc/libAfterImage/html/astext.html
+%%PORTDOCS%%share/doc/libAfterImage/html/astile.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asview.html
+%%PORTDOCS%%share/doc/libAfterImage/html/asvisual.html
+%%PORTDOCS%%share/doc/libAfterImage/html/blender.html
+%%PORTDOCS%%share/doc/libAfterImage/html/common.html
+%%PORTDOCS%%share/doc/libAfterImage/html/export.html
+%%PORTDOCS%%share/doc/libAfterImage/html/import.html
+%%PORTDOCS%%share/doc/libAfterImage/html/transform.html
+%%PORTDOCS%%share/doc/libAfterImage/html/ximage.html
+%%PORTDOCS%%@dirrm share/doc/libAfterImage/html
+%%PORTDOCS%%@dirrm share/doc/libAfterImage
+@dirrm include/libAfterImage