Attachment #124804 for bug #168307

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

Lines 6-19 Link Here

(-)gmime2/Makefile (-3 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= gmime	8	PORTNAME= gmime
9	PORTVERSION= 2.2.24	9	PORTVERSION= 2.2.27
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= mail	11	CATEGORIES?= mail
12	MASTER_SITES= GNOME	12	MASTER_SITES= GNOME
13		13
14	MAINTAINER?= ports@FreeBSD.org	14	MAINTAINER?= ahicks@p-o.co.uk
15	COMMENT?= Library (written in C) for parsing and creating messages using MIME	15	COMMENT?= Library (written in C) for parsing and creating messages using MIME
16		16
		17	LICENSE= LGPL21
		18
17	CONFLICTS= gmime-1.0.* gmime-2.4.*	19	CONFLICTS= gmime-1.0.* gmime-2.4.*
18		20
19	SLAVEDIRS= mail/gmime2-sharp	21	SLAVEDIRS= mail/gmime2-sharp
Lines 23-31 Link Here
23	USE_GNOME?= gnomehack glib20	25	USE_GNOME?= gnomehack glib20
24	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
		28	# www.freebsd.org/cgi/query-pr.cgi?pr=118092
		29	# Rename uudecode and uuencode to gmime-* to not conflict with userland
26	CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \	30	CONFIGURE_ARGS?= --with-libiconv=${LOCALBASE} \
27	--with-html-dir=${PREFIX}/share/doc \	31	--with-html-dir=${PREFIX}/share/doc \
28	--enable-mono=no	32	--enable-mono=no \
		33	--program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;"
29	CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"	34	CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
30	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	35	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
31		36

Lines 1-2 Link Here

(-)gmime2/distinfo (-2 / +2 lines)
1	SHA256 (gmime-2.2.24.tar.gz) = a1bcf57b67b0d245354b61c0a9a92a7467d8b97b9811e7a92927d0ad57018c52	1	SHA256 (gmime-2.2.27.tar.gz) = cf627f054707a78a154bdad85a6f2d3f704d8cab0c4f68fc0cc7bdb226e61974
2	SIZE (gmime-2.2.24.tar.gz) = 983507	2	SIZE (gmime-2.2.27.tar.gz) = 1040421




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

Return to bug 168307

Lines 1-33 Link Here

(-)gmime2/files/patch-src_Makefile.in (-33 lines)
1	#
2	# http://www.freebsd.org/cgi/query-pr.cgi?pr=118092
3	#
4	# Rename uudecode and uuencode to gmime-* to not conflict with userland
5	#
6	--- src/Makefile.in.orig 2008-07-19 20:57:47.000000000 -0300
7	+++ src/Makefile.in 2008-07-20 21:29:18.000000000 -0300
8	@@ -24,6 +24,7 @@
9	install_sh_SCRIPT = $(install_sh) -c
10	INSTALL_HEADER = $(INSTALL_DATA)
11	transform = $(program_transform_name)
12	+add_gmime = s/^/gmime-/
13	NORMAL_INSTALL = :
14	PRE_INSTALL = :
15	POST_INSTALL = :
16	@@ -293,7 +294,7 @@
17	if test -f $$p \
18	\|\| test -f $$p1 \
19	; then \
20	- f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
21	+ f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
22	echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
23	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" \|\| exit 1; \
24	else :; fi; \
25	@@ -302,7 +303,7 @@
26	uninstall-binPROGRAMS:
27	@$(NORMAL_UNINSTALL)
28	@list='$(bin_PROGRAMS)'; for p in $$list; do \
29	- f=`echo "$$p" \| sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
30	+ f=`echo "$$p" \| sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
31	echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
32	rm -f "$(DESTDIR)$(bindir)/$$f"; \
33	done