- Update to 1.18

PR:		125233
Submitted by:	Ports Fury

5 files changed, 23 insertions, 38 deletions

diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 90d59a79b049..bbaa940103f6 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libafterimage
-PORTVERSION=	1.15
-PORTREVISION=	3
+PORTVERSION=	1.18
 CATEGORIES=	graphics
 MASTER_SITES=	SF/afterstep
 DISTNAME=	libAfterImage-${PORTVERSION}
@@ -22,12 +21,10 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_GNOME=	librsvg2
-
 USE_BZIP2=	yes
+USE_XORG=	xext
+USE_GNOME=	gnometarget librsvg2
 GNU_CONFIGURE=	yes
-USE_XORG=	x11
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs \
@@ -52,11 +49,10 @@ CONFIGURE_ARGS+=	--disable-mmx-optimization
 post-extract:
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage
 
-pre-configure:
-	${REINPLACE_CMD} -e 's| malloc\.h | |g ; \
-		 s|-lgif|-lungif|g ; \
-		 s|CFLAGS="-O3"||g ; \
-		 s| -rdynamic||' ${WRKSRC}/configure
+post-patch:
+	@${REINPLACE_CMD} -e 's|CFLAGS="-O3"||g ; \
+		 s| malloc\.h | |g ; \
+		 s|-lgif|-lungif|g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/apps/ascompose.man \
diff --git a/graphics/libafterimage/distinfo b/graphics/libafterimage/distinfo
index c2ee14460088..c36807f81cac 100644
--- a/graphics/libafterimage/distinfo
+++ b/graphics/libafterimage/distinfo
@@ -1,3 +1,3 @@
-MD5 (libAfterImage-1.15.tar.bz2) = cac9f813e104f90d63fced6123d54a13
-SHA256 (libAfterImage-1.15.tar.bz2) = e132958d04c69c7870fd7e428bbd33c6235f91e9c5a07d70663c3c930c25877b
-SIZE (libAfterImage-1.15.tar.bz2) = 1091821
+MD5 (libAfterImage-1.18.tar.bz2) = 56a455b7710e2f3e2f9748777e87b8cd
+SHA256 (libAfterImage-1.18.tar.bz2) = f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312
+SIZE (libAfterImage-1.18.tar.bz2) = 1050328
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
index 2f6e16681452..e4d761b6f8e1 100644
--- a/graphics/libafterimage/files/patch-Makefile.in
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Aug  2 07:36:22 2007
-+++ Makefile.in	Thu Aug  2 23:00:21 2007
-@@ -79,7 +79,7 @@
+--- Makefile.in.orig	2008-06-19 05:34:51.000000000 +0900
++++ Makefile.in	2008-06-26 21:27:22.000000000 +0900
+@@ -81,7 +81,7 @@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -9,7 +9,7 @@
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -92,16 +92,16 @@
+@@ -94,16 +94,16 @@
  LEXFLAGS	=
  
  INSTALL		= @INSTALL@
@@ -32,7 +32,7 @@
  
  USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
-@@ -120,7 +120,7 @@
+@@ -122,7 +122,7 @@
  AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man3
  AFTER_APP_MAN_DIR	= $(DESTDIR)@mandir@/man1
  AFTER_SHAREDIR	= $(DESTDIR)@datadir@/$(LIB_DIR_NAME)
@@ -41,7 +41,7 @@
  
  # We want to build both static and dynamic libs, as some service apps may need 
  # static library as they gets run at compile time (ASDocGen for example)
-@@ -161,11 +161,10 @@
+@@ -163,11 +163,10 @@
  install.script:
  
  install.dyn:	mkdir
@@ -56,16 +56,16 @@
  		$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
  		if test `uname` = "Linux"; then \
  		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
-@@ -230,7 +229,7 @@
+@@ -232,7 +231,7 @@
  		)
  
  install.apps: install.lib
--		@(cd apps; make install || exit 1)
-+		@(cd apps; $(MAKE) install || exit 1)
+-		@(if test -d apps; then cd apps; make install || exit 1; fi)
++		@(if test -d apps; then cd apps; $(MAKE) install || exit 1; fi)
  
  # uninstallation targets : 
  #
-@@ -389,11 +388,8 @@
+@@ -391,11 +390,8 @@
  $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
  	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
  
@@ -79,18 +79,7 @@
  	 $(LIB_OBJS)
  
  install.man:
-@@ -402,8 +398,8 @@
- 			cd doc/man; \
- 			for f in `ls *.man`; do \
- 				page_name=`echo $$f| awk -F . '{print $$1}'`; \
--	  			echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
--	  			$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.1x; \
-+	  			echo $(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \
-+	  			$(INSTALL_DATA) $$page_name.man $(AFTER_MAN_DIR)/$$page_name.3x; \
- 			done; cd ../..; \
- 		fi
- 			
-@@ -419,7 +415,7 @@
+@@ -421,7 +417,7 @@
  			cd ../..; \
  		fi
  
diff --git a/graphics/libafterimage/pkg-descr b/graphics/libafterimage/pkg-descr
index ed1be57e91d4..ebbc9e8567ad 100644
--- a/graphics/libafterimage/pkg-descr
+++ b/graphics/libafterimage/pkg-descr
@@ -14,4 +14,4 @@ taken to compensate for screen colordepth limitation, and different error
 diffusion algorithms are used to provide for smooth images even in low
 colordepth modes.
 
-WWW: http://afterstep.sourceforge.net/afterimage/
+WWW: http://www.afterstep.org/afterimage/
diff --git a/graphics/libafterimage/pkg-plist b/graphics/libafterimage/pkg-plist
index 5aec31474610..8faa2ffdff86 100644
--- a/graphics/libafterimage/pkg-plist
+++ b/graphics/libafterimage/pkg-plist
@@ -22,12 +22,12 @@ include/libAfterImage/asvisual.h
 include/libAfterImage/blender.h
 include/libAfterImage/bmp.h
 include/libAfterImage/char2uni.h
-include/libAfterImage/config.h
 include/libAfterImage/draw.h
 include/libAfterImage/export.h
 include/libAfterImage/imencdec.h
 include/libAfterImage/import.h
 include/libAfterImage/pixmap.h
+include/libAfterImage/scanline.h
 include/libAfterImage/transform.h
 include/libAfterImage/ungif.h
 include/libAfterImage/xcf.h