Attachment 88432 Details for Bug 125233 – file.diff

[patch] file.diff

file.diff (text/plain), 5.53 KB, created by tkato432 on 2008-07-03 17:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2008-07-03 17:10:03 UTC

Size: 5.53 KB

patch

obsolete

>diff -urN /usr/ports/graphics/libafterimage/Makefile graphics/libafterimage/Makefile
>--- /usr/ports/graphics/libafterimage/Makefile	2008-06-07 00:23:23.000000000 +0900
>+++ graphics/libafterimage/Makefile	2008-06-26 21:40:28.000000000 +0900
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	libafterimage
>-PORTVERSION=	1.15
>-PORTREVISION=	3
>+PORTVERSION=	1.18
> CATEGORIES=	graphics
> MASTER_SITES=	SF/afterstep
> DISTNAME=	libAfterImage-${PORTVERSION}
>@@ -22,12 +21,10 @@
> 		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 \
>@@ -52,11 +49,10 @@
> 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 \
>diff -urN /usr/ports/graphics/libafterimage/distinfo graphics/libafterimage/distinfo
>--- /usr/ports/graphics/libafterimage/distinfo	2007-08-03 15:15:37.000000000 +0900
>+++ graphics/libafterimage/distinfo	2008-06-25 15:30:45.000000000 +0900
>@@ -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
>diff -urN /usr/ports/graphics/libafterimage/files/patch-Makefile.in graphics/libafterimage/files/patch-Makefile.in
>--- /usr/ports/graphics/libafterimage/files/patch-Makefile.in	2007-08-03 15:15:37.000000000 +0900
>+++ graphics/libafterimage/files/patch-Makefile.in	2008-06-26 21:28:54.000000000 +0900
>@@ -1,6 +1,6 @@
>---- 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
>@@ -9,7 +9,7 @@
>  FIND		= @FIND@
>  XARGS		= @XARGS@
>  LDCONFIG	= @LDCONFIG@
>-@@ -92,16 +92,16 @@
>+@@ -94,16 +94,16 @@
>  LEXFLAGS	=
>  
>  INSTALL		= @INSTALL@
>@@ -32,7 +32,7 @@
>  
>  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)
>@@ -41,7 +41,7 @@
>  
>  # 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
>@@ -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 \
>-@@ -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)
>  
>@@ -79,18 +79,7 @@
>  	 $(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
>  
>diff -urN /usr/ports/graphics/libafterimage/pkg-descr graphics/libafterimage/pkg-descr
>--- /usr/ports/graphics/libafterimage/pkg-descr	2001-10-09 01:28:17.000000000 +0900
>+++ graphics/libafterimage/pkg-descr	2008-06-25 15:29:25.000000000 +0900
>@@ -14,4 +14,4 @@
> 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/
>diff -urN /usr/ports/graphics/libafterimage/pkg-plist graphics/libafterimage/pkg-plist
>--- /usr/ports/graphics/libafterimage/pkg-plist	2005-06-27 18:40:55.000000000 +0900
>+++ graphics/libafterimage/pkg-plist	2008-06-26 21:31:59.000000000 +0900
>@@ -22,12 +22,12 @@
> 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

Actions: View | Diff

Attachments on bug 125233: 88432