- Really use freetype2 (detection was broken)

- Disconnect static libs
- Minor cleanup

5 files changed, 21 insertions, 10 deletions

diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index 7c344830a24c..35bced23de95 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -20,8 +20,9 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-sharedlibs --with-x
+CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs --with-x
 INSTALLS_SHLIB=	yes
+PLIST_SUB=	STATIC="@comment "
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/libafterbase/pkg-plist b/devel/libafterbase/pkg-plist
index 1d127f782ef7..b198b7a594d7 100644
--- a/devel/libafterbase/pkg-plist
+++ b/devel/libafterbase/pkg-plist
@@ -18,7 +18,7 @@ include/libAfterBase/timer.h
 include/libAfterBase/trace.h
 include/libAfterBase/xprop.h
 include/libAfterBase/xwrap.h
-lib/libAfterBase.a
+%%STATIC%%lib/libAfterBase.a
 lib/libAfterBase.so
 lib/libAfterBase.so.0
 @dirrm include/libAfterBase
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 241ce0d3fd72..14d5d758f2cf 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libafterimage
 PORTVERSION=	0.92
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	afterstep
@@ -17,7 +17,6 @@ DISTNAME=	libAfterImage-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic imaging library originally designed for AfterStep
 
-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 \
@@ -29,10 +28,11 @@ USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--enable-sharedlibs --with-builtin-xpm --with-x
+CONFIGURE_ARGS=	--disable-staticlibs --enable-sharedlibs --with-builtin-xpm --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 \
@@ -50,9 +50,6 @@ CONFIGURE_ARGS+=	--disable-mmx-optimization
 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 \
diff --git a/graphics/libafterimage/files/patch-configure b/graphics/libafterimage/files/patch-configure
new file mode 100644
index 000000000000..5be049807cab
--- /dev/null
+++ b/graphics/libafterimage/files/patch-configure
@@ -0,0 +1,13 @@
+
+$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 6c1ba8d69861..c681da38f2c7 100644
--- a/graphics/libafterimage/pkg-plist
+++ b/graphics/libafterimage/pkg-plist
@@ -22,7 +22,7 @@ include/libAfterImage/ungif.h
 include/libAfterImage/xcf.h
 include/libAfterImage/ximage.h
 include/libAfterImage/xpm.h
-lib/libAfterImage.a
+%%STATIC%%lib/libAfterImage.a
 lib/libAfterImage.so
 lib/libAfterImage.so.0
 %%PORTDOCS%%share/doc/libAfterImage/html/afterimage.html