Attachment 124804 Details for Bug 168307 – gmime2.diff

[patch] gmime2.diff

gmime2.diff (text/plain), 3.13 KB, created by Alan Hicks on 2012-05-24 17:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hicks

Created: 2012-05-24 17:10:02 UTC

Size: 3.13 KB

patch

obsolete

>diff -urN gmime2.bak/Makefile gmime2/Makefile
>--- gmime2.bak/Makefile	2012-05-24 11:11:42.000000000 +0100
>+++ gmime2/Makefile	2012-05-24 16:20:40.000000000 +0100
>@@ -6,14 +6,16 @@
> #
> 
> PORTNAME=	gmime
>-PORTVERSION=	2.2.24
>+PORTVERSION=	2.2.27
> PORTREVISION?=	0
> CATEGORIES?=	mail
> MASTER_SITES=	GNOME
> 
>-MAINTAINER?=	ports@FreeBSD.org
>+MAINTAINER?=	ahicks@p-o.co.uk
> COMMENT?=	Library (written in C) for parsing and creating messages using MIME
> 
>+LICENSE=	LGPL21
>+
> CONFLICTS=	gmime-1.0.* gmime-2.4.*
> 
> SLAVEDIRS=	mail/gmime2-sharp
>@@ -23,9 +25,12 @@
> USE_GNOME?=	gnomehack glib20
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>+# www.freebsd.org/cgi/query-pr.cgi?pr=118092
>+# Rename uudecode and uuencode to gmime-* to not conflict with userland
> CONFIGURE_ARGS?=	--with-libiconv=${LOCALBASE} \
> 			--with-html-dir=${PREFIX}/share/doc \
>-			--enable-mono=no
>+			--enable-mono=no \
>+			--program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;"
> CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
> CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
> 
>diff -urN gmime2.bak/distinfo gmime2/distinfo
>--- gmime2.bak/distinfo	2012-05-24 11:11:42.000000000 +0100
>+++ gmime2/distinfo	2012-05-24 13:48:06.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (gmime-2.2.24.tar.gz) = a1bcf57b67b0d245354b61c0a9a92a7467d8b97b9811e7a92927d0ad57018c52
>-SIZE (gmime-2.2.24.tar.gz) = 983507
>+SHA256 (gmime-2.2.27.tar.gz) = cf627f054707a78a154bdad85a6f2d3f704d8cab0c4f68fc0cc7bdb226e61974
>+SIZE (gmime-2.2.27.tar.gz) = 1040421
>diff -urN gmime2.bak/files/patch-src_Makefile.in gmime2/files/patch-src_Makefile.in
>--- gmime2.bak/files/patch-src_Makefile.in	2008-08-17 06:22:37.000000000 +0100
>+++ gmime2/files/patch-src_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,33 +0,0 @@
>-#
>-# http://www.freebsd.org/cgi/query-pr.cgi?pr=118092
>-#
>-# Rename uudecode and uuencode to gmime-* to not conflict with userland
>-#
>---- src/Makefile.in.orig	2008-07-19 20:57:47.000000000 -0300
>-+++ src/Makefile.in	2008-07-20 21:29:18.000000000 -0300
>-@@ -24,6 +24,7 @@
>- install_sh_SCRIPT = $(install_sh) -c
>- INSTALL_HEADER = $(INSTALL_DATA)
>- transform = $(program_transform_name)
>-+add_gmime = s/^/gmime-/
>- NORMAL_INSTALL = :
>- PRE_INSTALL = :
>- POST_INSTALL = :
>-@@ -293,7 +294,7 @@
>- 	  if test -f $$p \
>- 	     || test -f $$p1 \
>- 	  ; then \
>--	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
>-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
>- 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
>- 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
>- 	  else :; fi; \
>-@@ -302,7 +303,7 @@
>- uninstall-binPROGRAMS:
>- 	@$(NORMAL_UNINSTALL)
>- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
>--	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
>-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
>- 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
>- 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
>- 	done

Actions: View | Diff

Attachments on bug 168307: 124804