Attachment #54652 for bug #82678

View | Details | Raw Unified | Return to bug 82678
Collapse All | Expand All




#

PORTNAME=	libafterimage
PORTVERSION=	1.07
PORTREVISION=	2
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	afterstep

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Generic imaging library originally designed for AfterStep

LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
		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_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${X11BASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
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>


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| 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>

Lines 1-2 Link Here

(-)graphics/libafterimage/distinfo (-2 / +2 lines)
1	MD5 (libAfterImage-0.92.tar.gz) = ccee15e163b75c31240e625b27f7809c	1	MD5 (libAfterImage-1.07.tar.bz2) = bd59c81347029a9b272f76f6acbde088
2	SIZE (libAfterImage-0.92.tar.gz) = 532206	2	SIZE (libAfterImage-1.07.tar.bz2) = 956631




--- Makefile.in.orig	Sat Jun  4 05:44:06 2005
+++ Makefile.in	Thu Jun  9 17:41:53 2005
@@ -78,7 +78,7 @@
 		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 @@
 MV		= @MV@
 RM		= @RM@
 RMF		= @RM@ -f

 FIND		= @FIND@
 XARGS		= @XARGS@
 LDCONFIG	= @LDCONFIG@
@@ -91,16 +91,16 @@
 LEXFLAGS	=
 
 INSTALL		= @INSTALL@

 
 INCS_EXTRA	= @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_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@
@@ -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	= $(DESTDIR)@datadir@//doc/libAfterImage
 
 all:            @LIBPROG@ $(INSTALLONBUILD) apps
 
 # 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:
-		@( 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 @@
+.c.So:
+		$(CC) $(CCFLAGS) -fPIC $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $*.So
+
 #
 # include dependency files if they exist
 #
@@ -257,12 +265,9 @@
 $(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
+$(LIB_SHARED).$(LIBVERMAJOR): $(SOLIB_OBJS) $(LIB_INCS) config.h
+	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \
 	 $(LIB_OBJS)
 
 install.man:
@@ -364,7 +360,7 @@
 			cd ../..; \
 		fi
 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:	install.lib install.man install.doc install.apps
+install:	install.lib install.man install.apps




--- 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@ -m 755
-INSTALL_DATA	= @INSTALL@ -m 644
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_DATA	= @INSTALL_DATA@
 
 INCS_X		= @X_CFLAGS@
 INCS_PRIVATE    = 





$FreeBSD: ports/graphics/libafterimage/files/patch-configure,v 1.1 2005/05/19 17:58:51 vs Exp $

--- 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

Lines 1-49 Link Here

(-)graphics/libafterimage/pkg-plist (-23 / +11 lines)
1	bin/afterimage-libs
2	bin/ascompose	1	bin/ascompose
3	bin/asflip	2	bin/asflip
4	bin/asgrad	3	bin/asgrad
		4	bin/asi18n
5	bin/asmerge	5	bin/asmerge
6	bin/asscale	6	bin/asscale
7	bin/astext	7	bin/astext
8	bin/astile	8	bin/astile
		9	bin/asvector
9	bin/asview	10	bin/asview
10	include/libAfterImage/afterbase.h	11	include/libAfterImage/afterbase.h
11	include/libAfterImage/afterimage.h	12	include/libAfterImage/afterimage.h
12	include/libAfterImage/ascmap.h	13	include/libAfterImage/ascmap.h
13	include/libAfterImage/asfont.h	14	include/libAfterImage/asfont.h
		15	include/libAfterImage/asim_afterbase.h
14	include/libAfterImage/asimage.h	16	include/libAfterImage/asimage.h
		17	include/libAfterImage/asimagexml.h
		18	include/libAfterImage/asstorage.h
15	include/libAfterImage/asvisual.h	19	include/libAfterImage/asvisual.h
16	include/libAfterImage/blender.h	20	include/libAfterImage/blender.h
		21	include/libAfterImage/bmp.h
		22	include/libAfterImage/char2uni.h
17	include/libAfterImage/config.h	23	include/libAfterImage/config.h
		24	include/libAfterImage/draw.h
18	include/libAfterImage/export.h	25	include/libAfterImage/export.h
		26	include/libAfterImage/imencdec.h
19	include/libAfterImage/import.h	27	include/libAfterImage/import.h
		28	include/libAfterImage/pixmap.h
20	include/libAfterImage/transform.h	29	include/libAfterImage/transform.h
21	include/libAfterImage/ungif.h	30	include/libAfterImage/ungif.h
22	include/libAfterImage/xcf.h	31	include/libAfterImage/xcf.h
23	include/libAfterImage/ximage.h	32	include/libAfterImage/ximage.h
24	include/libAfterImage/xpm.h	33	include/libAfterImage/xpm.h
25	%%STATIC%%lib/libAfterImage.a	34	include/libAfterImage/xwrap.h
26	lib/libAfterImage.so	35	lib/libAfterImage.so
27	lib/libAfterImage.so.0	36	lib/libAfterImage.so.0
28	%%PORTDOCS%%share/doc/libAfterImage/html/afterimage.html
29	%%PORTDOCS%%share/doc/libAfterImage/html/ascmap.html
30	%%PORTDOCS%%share/doc/libAfterImage/html/ascompose.html
31	%%PORTDOCS%%share/doc/libAfterImage/html/asflip.html
32	%%PORTDOCS%%share/doc/libAfterImage/html/asfont.html
33	%%PORTDOCS%%share/doc/libAfterImage/html/asgrad.html
34	%%PORTDOCS%%share/doc/libAfterImage/html/asimage.html
35	%%PORTDOCS%%share/doc/libAfterImage/html/asmerge.html
36	%%PORTDOCS%%share/doc/libAfterImage/html/asscale.html
37	%%PORTDOCS%%share/doc/libAfterImage/html/astext.html
38	%%PORTDOCS%%share/doc/libAfterImage/html/astile.html
39	%%PORTDOCS%%share/doc/libAfterImage/html/asview.html
40	%%PORTDOCS%%share/doc/libAfterImage/html/asvisual.html
41	%%PORTDOCS%%share/doc/libAfterImage/html/blender.html
42	%%PORTDOCS%%share/doc/libAfterImage/html/common.html
43	%%PORTDOCS%%share/doc/libAfterImage/html/export.html
44	%%PORTDOCS%%share/doc/libAfterImage/html/import.html
45	%%PORTDOCS%%share/doc/libAfterImage/html/transform.html
46	%%PORTDOCS%%share/doc/libAfterImage/html/ximage.html
47	%%PORTDOCS%%@dirrm share/doc/libAfterImage/html
48	%%PORTDOCS%%@dirrm share/doc/libAfterImage
49	@dirrm include/libAfterImage	37	@dirrm include/libAfterImage

Return to bug 82678

Lines 7-14 Link Here

(-)graphics/libafterimage/Makefile (-17 / +17 lines)
7	#	7	#
8		8
9	PORTNAME= libafterimage	9	PORTNAME= libafterimage
10	PORTVERSION= 0.92	10	PORTVERSION= 1.07
11	PORTREVISION= 2
12	CATEGORIES= graphics	11	CATEGORIES= graphics
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= afterstep	13	MASTER_SITE_SUBDIR= afterstep
Lines 17-42 Link Here
17	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
18	COMMENT= Generic imaging library originally designed for AfterStep	17	COMMENT= Generic imaging library originally designed for AfterStep
19		18
20	LIB_DEPENDS= AfterBase.0:${PORTSDIR}/devel/libafterbase \	19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
21	jpeg.9:${PORTSDIR}/graphics/jpeg \
22	ungif.5:${PORTSDIR}/graphics/libungif \	20	ungif.5:${PORTSDIR}/graphics/libungif \
23	png.5:${PORTSDIR}/graphics/png \	21	png.5:${PORTSDIR}/graphics/png \
24	tiff.4:${PORTSDIR}/graphics/tiff \	22	tiff.4:${PORTSDIR}/graphics/tiff \
25	freetype.9:${PORTSDIR}/print/freetype2	23	freetype.9:${PORTSDIR}/print/freetype2
26		24
27	USE_REINPLACE= yes	25	USE_BZIP2= yes
28	USE_X_PREFIX= yes	26	USE_X_PREFIX= yes
		27	USE_REINPLACE= yes
29	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
30	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	29	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
32	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	31	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
33	CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs --with-builtin-xpm --with-x	32	CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs \
		33	--without-builtin-ungif --without-afterbase \
		34	--with-x
34	INSTALLS_SHLIB= yes	35	INSTALLS_SHLIB= yes
35	PLIST_SUB= STATIC="@comment "
36		36
37	MAN1= ascompose.1x	37	MAN1= ascompose.1x
38	MAN3= afterimage.3x ascmap.3x asfont.3x asimage.3x asvisual.3x blender.3x \
39	export.3x import.3x transform.3x ximage.3x
40		38
41	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
42		40
Lines 46-61 Link Here
46	CONFIGURE_ARGS+= --disable-mmx-optimization	44	CONFIGURE_ARGS+= --disable-mmx-optimization
47	.endif	45	.endif
48		46
49	.if !defined(NOPORTDOCS)
50	INSTALL_TARGET= install install.doc
51	.endif
52
53	post-extract:	47	post-extract:
54	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage	48	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage
55		49
56	post-patch:	50	post-patch:
57	@${REINPLACE_CMD} -e 's\|-lgif\|-lungif\|g' ${WRKSRC}/configure	51	@${REINPLACE_CMD} -e 's\| malloc\.h \| \|g ; \
58	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} ${REINPLACE_CMD} -e \	52	s\|-lgif\|-lungif\|g ; \
59	's\|<malloc.h>\|<stdlib.h>\|g'	53	s\|CFLAGS="-O3"\|\|g ; \
		54	s\| -rdynamic\|\|' ${WRKSRC}/configure
		55	@${REINPLACE_CMD} -e 's\|; ;\|;\|g' ${WRKSRC}/asimagexml.c
		56
		57	post-install:
		58	${INSTALL_MAN} ${WRKSRC}/apps/ascompose.man \
		59	${MANPREFIX}/man/man1/ascompose.1x
60		60
61	.include <bsd.port.post.mk>	61	.include <bsd.port.post.mk>

Lines 1-17 Link Here

(-)graphics/libafterimage/files/patch-Makefile.in (-70 / +47 lines)
1	--- Makefile.in.orig Tue Jan 15 21:53:17 2002	1	--- Makefile.in.orig Sat Jun 4 05:44:06 2005
2	+++ Makefile.in Mon Mar 22 15:04:58 2004	2	+++ Makefile.in Thu Jun 9 17:41:53 2005
3	@@ -14,6 +14,10 @@	3	@@ -78,7 +78,7 @@
4	blender.o export.o import.o transform.o \
5	ungif.o xcf.o ximage.o xpm.o
6
7	+SOLIB_OBJS= @AFTERBASE_C@ ascmap.So asfont.So asimage.So asvisual.So \
8	+ blender.So export.So import.So transform.So \
9	+ ungif.So xcf.So ximage.So xpm.So
10	+
11	LIB_DOCS= afterimage.h ascmap.h asfont.h asimage.h asvisual.h \
12	blender.h export.h import.h transform.h ximage.h
13
14	@@ -47,7 +51,7 @@
15	MV = @MV@	4	MV = @MV@
16	RM = @RM@	5	RM = @RM@
17	RMF = @RM@ -f	6	RMF = @RM@ -f
Lines 20-26 Link Here
20	FIND = @FIND@	9	FIND = @FIND@
21	XARGS = @XARGS@	10	XARGS = @XARGS@
22	LDCONFIG = @LDCONFIG@	11	LDCONFIG = @LDCONFIG@
23	@@ -59,11 +63,11 @@	12	@@ -91,16 +91,16 @@
24	LEXFLAGS =	13	LEXFLAGS =
25		14
26	INSTALL = @INSTALL@	15	INSTALL = @INSTALL@
Lines 37-110 Link Here
37		26
38	INCS_EXTRA = @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @TTF_INCLUDES@	27	INCS_EXTRA = @XPM_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @GIF_CFLAGS@ @TIFF_CFLAGS@ @TTF_INCLUDES@
39	INCS_X = @X_CFLAGS@	28	INCS_X = @X_CFLAGS@
40	@@ -79,7 +83,7 @@	29	INCS_PRIVATE =
41	AFTER_MAN_DIR = @mandir@/man3	30	-INCLUDES = $(INCS_EXTRA) $(INCS_PRIVATE) $(INCS_X)
42	AFTER_APP_MAN_DIR = @mandir@/man1	31	+INCLUDES = -I. $(INCS_EXTRA) $(INCS_PRIVATE) $(INCS_X)
43	AFTER_SHAREDIR = @datadir@/libAfterImage	32
		33	USER_LD_FLAGS = @user_ldflags@
		34	LIBS_X = @x_libs@
		35	@@ -119,7 +119,7 @@
		36	AFTER_MAN_DIR = $(DESTDIR)@mandir@/man3
		37	AFTER_APP_MAN_DIR = $(DESTDIR)@mandir@/man1
		38	AFTER_SHAREDIR = $(DESTDIR)@datadir@/$(LIB_DIR_NAME)
44	-AFTER_DOC_DIR = $(AFTER_SHAREDIR)/doc	39	-AFTER_DOC_DIR = $(AFTER_SHAREDIR)/doc
45	+AFTER_DOC_DIR = @datadir@/doc/libAfterImage	40	+AFTER_DOC_DIR = $(DESTDIR)@datadir@//doc/libAfterImage
46
47	all: @LIBPROG@ $(INSTALLONBUILD) apps
48		41
49	@@ -111,10 +115,9 @@	42	# We want to build both static and dynamic libs, as some service apps may need
		43	# static library as they gets run at compile time (ASDocGen for example)
		44	@@ -155,11 +155,10 @@
50	install.script:	45	install.script:
51		46
52	install.dyn:	47	install.dyn:
53	- $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)	48	- @( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
54	+ $(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)	49	- $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \
55	$(INSTALL_SCRIPT) afterimage-libs $(AFTER_BIN_DIR)	50	+ @( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)"; \
56	- -@/bin/rm -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED)	51	+ $(INSTALL_LIB) $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR); \
57	- ln -sf $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR)	52	$(INSTALL_SCRIPT) afterimage-libs afterimage-config $(AFTER_BIN_DIR); \
58	+ -@/bin/rm -f $(LIBDIR)/$(LIB_SHARED)	53	- $(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
59	ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED)	54	- $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
60	@( \	55	+ $(RM) -f $(LIBDIR)/$(LIB_SHARED); \
61	if test `uname` = "Linux"; then \	56	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
62	@@ -239,12 +242,17 @@	57	if test `uname` = "Linux"; then \
63	$(AR) $(LIB_STATIC) $(LIB_OBJS)	58	if test $(LIBDIR) = "/lib" \|\| test $(LIBDIR) = "/usr/lib"; then \
64	$(RANLIB) $(LIB_STATIC)	59	@@ -221,7 +220,7 @@
65		60	)
66	+.SUFFIXES: .o .So	61
67	+	62	install.apps: install.lib
68	.c.o:	63	- cd apps; make install; cd ..
69	$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c	64	+ cd apps; $(MAKE) install; cd ..
70		65
71	.c.s:	66	uninstall.bin:
72	$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c	67
73		68	@@ -333,11 +332,8 @@
74	+.c.So:
75	+ $(CC) $(CCFLAGS) -fPIC $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $.c -o $.So
76	+
77	#
78	# include dependency files if they exist
79	#
80	@@ -257,12 +265,9 @@
81	$(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)	69	$(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
82	ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)	70	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
83		71
84	-$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)	72	-$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER)
85	- ln -sf $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)	73	- $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
86	-	74	-
87	-$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h	75	-$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
88	- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \	76	- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
89	- $(LIB_OBJS)	77	+$(LIB_SHARED).$(LIBVERMAJOR): $(LIB_OBJS) $(LIB_INCS) config.h
90	+$(LIB_SHARED).$(LIBVERMAJOR): $(SOLIB_OBJS) $(LIB_INCS) config.h
91	+ $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \	78	+ $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVERMAJOR) \
92	+ $(SOLIB_OBJS)	79	$(LIB_OBJS)
93		80
94	doc.xref: $(LIB_DOCS)	81	install.man:
95	SRCS=`echo "$(LIB_DOCS) " \| sed "s/.h / /g"`; \	82	@@ -364,7 +360,7 @@
96	@@ -307,8 +312,6 @@	83	cd ../..; \
97		84	fi
98	install.doc:
99	SRCS=`echo "$(LIB_DOCS) " \| sed "s/.h / /g"`; cd doc/html; \
100	- echo "$(MKDIR) $(AFTER_SHAREDIR)"; \
101	- $(MKDIR) $(AFTER_SHAREDIR); \
102	echo "$(MKDIR) $(AFTER_DOC_DIR)"; \
103	$(MKDIR) $(AFTER_DOC_DIR); \
104	echo "$(MKDIR) $(AFTER_DOC_DIR)/html"; \
105	@@ -318,7 +321,7 @@
106	$(INSTALL_DATA) $$f $(AFTER_DOC_DIR)/html/$$f; \
107	done; cd ../..;
108		85
109	-install: install.lib install.man install.doc install.apps	86	-install: install.lib install.man install.doc install.apps
110	+install: install.lib install.man install.apps	87	+install: install.lib install.man install.apps

Lines 1-13 Link Here

(-)graphics/libafterimage/files/patch-apps:Makefile.in (-5 / +12 lines)
1	--- apps/Makefile.in.orig Wed Jan 16 06:55:09 2002	1	--- apps/Makefile.in.orig Mon Feb 28 23:52:47 2005
2	+++ apps/Makefile.in Thu Feb 28 06:28:56 2002	2	+++ apps/Makefile.in Thu Jun 9 16:36:08 2005
3	@@ -19,8 +19,8 @@	3	@@ -13,14 +13,14 @@
		4	MV = @MV@
		5	RM = @RM@
		6	RMF = @RM@ -f
		7	-MKDIR = @MKDIR@
		8	+MKDIR = @MKDIR@ -p
		9	FIND = @FIND@
		10	XARGS = @XARGS@
4	LDCONFIG = @LDCONFIG@	11	LDCONFIG = @LDCONFIG@
5		12
6	INSTALL = @INSTALL@	13	INSTALL = @INSTALL@
7	-INSTALL_PROGRAM = @INSTALL@ -s -m 755	14	-INSTALL_PROGRAM = @INSTALL@ -m 755
8	-INSTALL_DATA = @INSTALL@ -m 644	15	-INSTALL_DATA = @INSTALL@ -m 644
9	+INSTALL_PROGRAM = @INSTALL_PROGRAM@	16	+INSTALL_PROGRAM = @INSTALL_PROGRAM@
10	+INSTALL_DATA = @INSTALL_DATA@	17	+INSTALL_DATA = @INSTALL_DATA@
11		18
12	INCS_X = @X_CFLAGS@	19	INCS_X = @X_CFLAGS@
13	INCS_PRIVATE= @APPS_AFTERBASE_CFLAGS@ -I../..	20	INCS_PRIVATE =

Lines 1-13 Link Here

(-)graphics/libafterimage/files/patch-configure (-13 lines)
1
2	$FreeBSD: ports/graphics/libafterimage/files/patch-configure,v 1.1 2005/05/19 17:58:51 vs Exp $
3
4	--- configure.orig
5	+++ configure
6	@@ -4878,6 +4878,7 @@
7	cat >conftest.$ac_ext <<_ACEOF
8	#line 4879 "configure"
9	#include "confdefs.h"
10	+#include <ft2build.h>
11	#include <freetype/freetype.h>
12	int main(){FT_Face f; return 0;}
13	_ACEOF