Index: head/graphics/libafterimage/Makefile
===================================================================
--- head/graphics/libafterimage/Makefile	(revision 216269)
+++ head/graphics/libafterimage/Makefile	(revision 216270)
@@ -1,65 +1,61 @@
 # ex:ts=8
 # New ports collection makefile for:	libAfterImage
 # Date created:			Oct 7, 2001
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libafterimage
-PORTVERSION=	1.15
-PORTREVISION=	3
+PORTVERSION=	1.18
 CATEGORIES=	graphics
 MASTER_SITES=	SF/afterstep
 DISTNAME=	libAfterImage-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic imaging library originally designed for AfterStep
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
 		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 \
 		--without-builtin-ungif --without-afterbase \
 		--with-x
 USE_LDCONFIG=	yes
 
 MAN1=	ascompose.1x
 MAN3=	ascmap.3x afterimage.3x ascompose.3x asflip.3x asfont.3x asgrad.3x	\
 	asimage.3x asimagexml.3x asmerge.3x asscale.3x astext.3x astile.3x	\
 	asview.3x asvisual.3x blender.3x char2uni.3x common.3x export.3x	\
 	imencdec.3x import.3x transform.3x ximage.3x
 
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--enable-mmx-optimization
 .else
 CONFIGURE_ARGS+=	--disable-mmx-optimization
 .endif
 
 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 \
 		${MANPREFIX}/man/man1/ascompose.1x
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/libafterimage/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.22
\ No newline at end of property
+1.23
\ No newline at end of property
Index: head/graphics/libafterimage/distinfo
===================================================================
--- head/graphics/libafterimage/distinfo	(revision 216269)
+++ head/graphics/libafterimage/distinfo	(revision 216270)
@@ -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

Property changes on: head/graphics/libafterimage/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/graphics/libafterimage/files/patch-Makefile.in
===================================================================
--- head/graphics/libafterimage/files/patch-Makefile.in	(revision 216269)
+++ head/graphics/libafterimage/files/patch-Makefile.in	(revision 216270)
@@ -1,101 +1,90 @@
---- 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
 -MKDIR		= @MKDIR@
 +MKDIR		= @MKDIR@ -p
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -92,16 +92,16 @@
+@@ -94,16 +94,16 @@
  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@ @SVG_CFLAGS@ @TTF_INCLUDES@
  INCS_X		= @X_CFLAGS@
  INCS_PRIVATE    = 
 -INCLUDES	= $(INCS_EXTRA) $(INCS_PRIVATE) $(INCS_X)
 +INCLUDES	= -I. $(INCS_EXTRA) $(INCS_PRIVATE) $(INCS_X)
  
  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)
 -AFTER_DOC_DIR	= $(AFTER_SHAREDIR)/doc
 +AFTER_DOC_DIR	= $(DESTDIR)@datadir@//doc/libAfterImage
  
  # 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
 -		@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
 -		$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \
 +		@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)"; \
 +		$(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR); \
  		$(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \
 -		$(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
 -		$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
 +		$(RM) -f $(LIBDIR)/$(LIB_SHARED); \
  		$(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)
  
 -$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
 -	$(LN_S) -f $(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)
  
  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
  
 -install:	install.lib install.man install.doc install.apps
 +install:	install.lib install.man install.apps
  
  
  uninstall:	uninstall.lib

Property changes on: head/graphics/libafterimage/files/patch-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/graphics/libafterimage/pkg-descr
===================================================================
--- head/graphics/libafterimage/pkg-descr	(revision 216269)
+++ head/graphics/libafterimage/pkg-descr	(revision 216270)
@@ -1,17 +1,17 @@
 libAfterImage is the imaging library implemented for AfterStep X Window
 Manager. It has been generalized to be suitable for any application in
 need of robust graphics engine.
 
 It provides facilities for loading images from files of different formats,
 compressed in memory storage of images, scaling, tinting/shading, flipping
 and superimposition of arbitrary number of images over each other. In
 addition it allows for linear gradients drawing, and antialiased/smoothed
 text drawing using both  FreeType library and X Window fonts.
 
 Primary goals of this library are to achieve exceptional quality of images
 and text, making code fast and small at the same time. Additional steps are
 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/

Property changes on: head/graphics/libafterimage/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/graphics/libafterimage/pkg-plist
===================================================================
--- head/graphics/libafterimage/pkg-plist	(revision 216269)
+++ head/graphics/libafterimage/pkg-plist	(revision 216270)
@@ -1,39 +1,39 @@
 bin/afterimage-config
 bin/afterimage-libs
 bin/ascompose
 bin/asflip
 bin/asgrad
 bin/asi18n
 bin/asmerge
 bin/asscale
 bin/astext
 bin/astile
 bin/asvector
 bin/asview
 include/libAfterImage/afterbase.h
 include/libAfterImage/afterimage.h
 include/libAfterImage/ascmap.h
 include/libAfterImage/asfont.h
 include/libAfterImage/asim_afterbase.h
 include/libAfterImage/asimage.h
 include/libAfterImage/asimagexml.h
 include/libAfterImage/asstorage.h
 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
 include/libAfterImage/ximage.h
 include/libAfterImage/xpm.h
 include/libAfterImage/xwrap.h
 lib/libAfterImage.so
 lib/libAfterImage.so.0
 @dirrm include/libAfterImage

Property changes on: head/graphics/libafterimage/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property