3 files changed, 36 insertions, 23 deletions

diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index ebfa19dcbccf..51d89762b982 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libafterimage
-PORTVERSION=	1.07
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
@@ -35,6 +34,10 @@ CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs \
 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>
 
@@ -47,12 +50,11 @@ CONFIGURE_ARGS+=	--disable-mmx-optimization
 post-extract:
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage
 
-post-patch:
-	@${REINPLACE_CMD} -e 's| malloc\.h | |g ; \
+pre-configure:
+	${REINPLACE_CMD} -e 's| malloc\.h | |g ; \
 		 s|-lgif|-lungif|g ; \
 		 s|CFLAGS="-O3"||g ; \
 		 s| -rdynamic||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|; ;|;|g' ${WRKSRC}/asimagexml.c
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/apps/ascompose.man \
diff --git a/graphics/libafterimage/distinfo b/graphics/libafterimage/distinfo
index 272deb19bee1..c2ee14460088 100644
--- a/graphics/libafterimage/distinfo
+++ b/graphics/libafterimage/distinfo
@@ -1,3 +1,3 @@
-MD5 (libAfterImage-1.07.tar.bz2) = bd59c81347029a9b272f76f6acbde088
-SHA256 (libAfterImage-1.07.tar.bz2) = b3047c7307c6f6db2de1814be681b26c324378124d4b49fbb468428523da1c74
-SIZE (libAfterImage-1.07.tar.bz2) = 956631
+MD5 (libAfterImage-1.15.tar.bz2) = cac9f813e104f90d63fced6123d54a13
+SHA256 (libAfterImage-1.15.tar.bz2) = e132958d04c69c7870fd7e428bbd33c6235f91e9c5a07d70663c3c930c25877b
+SIZE (libAfterImage-1.15.tar.bz2) = 1091821
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
index 176b0c8635e6..2f6e16681452 100644
--- a/graphics/libafterimage/files/patch-Makefile.in
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Jun  4 05:44:06 2005
-+++ Makefile.in	Thu Jun  9 17:41:53 2005
-@@ -78,7 +78,7 @@
+--- Makefile.in.orig	Thu Aug  2 07:36:22 2007
++++ Makefile.in	Thu Aug  2 23:00:21 2007
+@@ -79,7 +79,7 @@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -9,7 +9,7 @@
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -91,16 +91,16 @@
+@@ -92,16 +92,16 @@
  LEXFLAGS	=
  
  INSTALL		= @INSTALL@
@@ -24,7 +24,7 @@
 +INSTALL_LIB	= @INSTALL_DATA@
 +INSTALL_SCRIPT	= @INSTALL_SCRIPT@
  
- INCS_EXTRA	= @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @TTF_INCLUDES@
+ 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)
@@ -32,7 +32,7 @@
  
  USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
-@@ -119,7 +119,7 @@
+@@ -120,7 +120,7 @@
  AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man3
  AFTER_APP_MAN_DIR	= $(DESTDIR)@mandir@/man1
  AFTER_SHAREDIR	= $(DESTDIR)@datadir@/$(LIB_DIR_NAME)
@@ -41,10 +41,10 @@
  
  # 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)
-@@ -155,11 +155,10 @@
+@@ -161,11 +161,10 @@
  install.script:
  
- install.dyn:
+ install.dyn:	mkdir
 -		@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
 -		$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \
 +		@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)"; \
@@ -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 \
-@@ -221,7 +220,7 @@
+@@ -230,7 +229,7 @@
  		)
  
  install.apps: install.lib
--		cd apps; make install; cd ..
-+		cd apps; $(MAKE) install; cd ..
+-		@(cd apps; make install || exit 1)
++		@(cd apps; $(MAKE) install || exit 1)
  
- uninstall.bin:
- 
-@@ -333,11 +332,8 @@
+ # uninstallation targets : 
+ #
+@@ -389,11 +388,8 @@
  $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
  	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
  
@@ -79,7 +79,18 @@
  	 $(LIB_OBJS)
  
  install.man:
-@@ -364,7 +360,7 @@
+@@ -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 @@
  			cd ../..; \
  		fi