6 files changed, 91 insertions, 130 deletions

diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 5249c16249db..f047921e0033 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libafterimage
-PORTVERSION=	0.92
-PORTREVISION=	2
+PORTVERSION=	1.07
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
@@ -17,45 +16,46 @@ DISTNAME=	libAfterImage-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic imaging library originally designed for AfterStep
 
-LIB_DEPENDS=	AfterBase.0:${PORTSDIR}/devel/libafterbase \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+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_REINPLACE=	yes
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs --with-builtin-xpm --with-x
+CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs \
+		--without-builtin-ungif --without-afterbase \
+		--with-x
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	STATIC="@comment "
 
 MAN1=	ascompose.1x
-MAN3=	afterimage.3x ascmap.3x asfont.3x asimage.3x asvisual.3x blender.3x \
-	export.3x import.3x transform.3x ximage.3x
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MMX) && (${ARCH} == "i386")
+.if ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--enable-mmx-optimization
 .else
 CONFIGURE_ARGS+=	--disable-mmx-optimization
 .endif
 
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET=	install install.doc
-.endif
-
 post-extract:
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lgif|-lungif|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|<malloc.h>|<stdlib.h>|g'
+	@${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 \
+		${MANPREFIX}/man/man1/ascompose.1x
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libafterimage/distinfo b/graphics/libafterimage/distinfo
index b68d3650a5a9..7c6c375e91ad 100644
--- a/graphics/libafterimage/distinfo
+++ b/graphics/libafterimage/distinfo
@@ -1,2 +1,2 @@
-MD5 (libAfterImage-0.92.tar.gz) = ccee15e163b75c31240e625b27f7809c
-SIZE (libAfterImage-0.92.tar.gz) = 532206
+MD5 (libAfterImage-1.07.tar.bz2) = bd59c81347029a9b272f76f6acbde088
+SIZE (libAfterImage-1.07.tar.bz2) = 956631
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
index 02f7e16d5e3b..176b0c8635e6 100644
--- a/graphics/libafterimage/files/patch-Makefile.in
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -1,17 +1,6 @@
---- Makefile.in.orig	Tue Jan 15 21:53:17 2002
-+++ Makefile.in	Mon Mar 22 15:04:58 2004
-@@ -14,6 +14,10 @@
- 		blender.o export.o import.o transform.o \
- 		ungif.o xcf.o ximage.o xpm.o
- 
-+SOLIB_OBJS= @AFTERBASE_C@ ascmap.So asfont.So asimage.So asvisual.So \
-+		blender.So export.So import.So transform.So \
-+		ungif.So xcf.So ximage.So xpm.So
-+
- LIB_DOCS= afterimage.h ascmap.h asfont.h asimage.h asvisual.h \
- 		  blender.h export.h import.h transform.h ximage.h
- 
-@@ -47,7 +51,7 @@
+--- Makefile.in.orig	Sat Jun  4 05:44:06 2005
++++ Makefile.in	Thu Jun  9 17:41:53 2005
+@@ -78,7 +78,7 @@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -20,7 +9,7 @@
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -59,11 +63,11 @@
+@@ -91,16 +91,16 @@
  LEXFLAGS	=
  
  INSTALL		= @INSTALL@
@@ -37,74 +26,62 @@
  
  INCS_EXTRA	= @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @TTF_INCLUDES@
  INCS_X		= @X_CFLAGS@
-@@ -79,7 +83,7 @@
- AFTER_MAN_DIR	= @mandir@/man3
- AFTER_APP_MAN_DIR	= @mandir@/man1
- AFTER_SHAREDIR	= @datadir@/libAfterImage
+ 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@
+@@ -119,7 +119,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	= @datadir@/doc/libAfterImage
++AFTER_DOC_DIR	= $(DESTDIR)@datadir@//doc/libAfterImage
  
- all:            @LIBPROG@ $(INSTALLONBUILD) apps
- 
-@@ -111,10 +115,9 @@
+ # 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 @@
  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 \
-@@ -239,12 +242,17 @@
- 		$(AR) $(LIB_STATIC) $(LIB_OBJS)
- 		$(RANLIB) $(LIB_STATIC)
- 
-+.SUFFIXES: .o .So
-+
- .c.o:
- 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
- 
- .c.s:
- 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c
- 
-+.c.So:
-+		$(CC) $(CCFLAGS) -fPIC $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $*.So
-+
- #
- # include dependency files if they exist
- #
-@@ -257,12 +265,9 @@
+-		@( 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 \
+@@ -221,7 +220,7 @@
+ 		)
+ 
+ install.apps: install.lib
+-		cd apps; make install; cd ..
++		cd apps; $(MAKE) install; cd ..
+ 
+ uninstall.bin:
+ 
+@@ -333,11 +332,8 @@
  $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
- 	ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
  
 -$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
--	ln -sf $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+-	$(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_OBJS)
-+$(LIB_SHARED).$(LIBVERMAJOR): $(SOLIB_OBJS) $(LIB_INCS) config.h
++$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_OBJS) $(LIB_INCS) config.h
 +	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \
-+	 $(SOLIB_OBJS)
- 
- doc.xref: $(LIB_DOCS)
- 	SRCS=`echo "$(LIB_DOCS) " | sed "s/.h / /g"`; \
-@@ -307,8 +312,6 @@
+ 	 $(LIB_OBJS)
  
- 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 +321,7 @@
- 		  $(INSTALL_DATA) $$f $(AFTER_DOC_DIR)/html/$$f; \
- 		done; cd ../..;
+ install.man:
+@@ -364,7 +360,7 @@
+ 			cd ../..; \
+ 		fi
  
 -install:	install.lib install.man install.doc install.apps
 +install:	install.lib install.man install.apps
diff --git a/graphics/libafterimage/files/patch-apps:Makefile.in b/graphics/libafterimage/files/patch-apps:Makefile.in
index 811410e5da41..2a2ad2c70e01 100644
--- a/graphics/libafterimage/files/patch-apps:Makefile.in
+++ b/graphics/libafterimage/files/patch-apps:Makefile.in
@@ -1,13 +1,20 @@
---- apps/Makefile.in.orig	Wed Jan 16 06:55:09 2002
-+++ apps/Makefile.in	Thu Feb 28 06:28:56 2002
-@@ -19,8 +19,8 @@
+--- apps/Makefile.in.orig	Mon Feb 28 23:52:47 2005
++++ apps/Makefile.in	Thu Jun  9 16:36:08 2005
+@@ -13,14 +13,14 @@
+ MV		= @MV@
+ RM		= @RM@
+ RMF		= @RM@ -f
+-MKDIR		= @MKDIR@
++MKDIR		= @MKDIR@ -p
+ FIND		= @FIND@
+ XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
  
  INSTALL		= @INSTALL@
--INSTALL_PROGRAM	= @INSTALL@ -s -m 755
+-INSTALL_PROGRAM	= @INSTALL@ -m 755
 -INSTALL_DATA	= @INSTALL@ -m 644
 +INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 +INSTALL_DATA	= @INSTALL_DATA@
  
  INCS_X		= @X_CFLAGS@
- INCS_PRIVATE= @APPS_AFTERBASE_CFLAGS@ -I../..
+ INCS_PRIVATE    = 
diff --git a/graphics/libafterimage/files/patch-configure b/graphics/libafterimage/files/patch-configure
deleted file mode 100644
index 5be049807cab..000000000000
--- a/graphics/libafterimage/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -4878,6 +4878,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line 4879 "configure"
- #include "confdefs.h"
-+#include <ft2build.h>
- #include <freetype/freetype.h>
-                             int main(){FT_Face f; return 0;}
- _ACEOF
diff --git a/graphics/libafterimage/pkg-plist b/graphics/libafterimage/pkg-plist
index c681da38f2c7..5aec31474610 100644
--- a/graphics/libafterimage/pkg-plist
+++ b/graphics/libafterimage/pkg-plist
@@ -1,49 +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/transform.h
 include/libAfterImage/ungif.h
 include/libAfterImage/xcf.h
 include/libAfterImage/ximage.h
 include/libAfterImage/xpm.h
-%%STATIC%%lib/libAfterImage.a
+include/libAfterImage/xwrap.h
 lib/libAfterImage.so
 lib/libAfterImage.so.0
-%%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