Attachment #100568 for bug #139871

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





PORTNAME=	iksemel
PORTVERSION=	1.4
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}



LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls

USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"


INFO=	iksemel

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \
	    ${WRKSRC}/doc/iksemel.texi
	@${REINPLACE_CMD} -e 's|pkgconfigdir=$$(libdir)/pkgconfig|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
	    ${WRKSRC}/Makefile.am

.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)iksemel/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2007-08-02 12:49:14.000000000 +0200
2	+++ Makefile.in 2007-10-01 18:22:45.000000000 +0200
3	@@ -187,7 +187,7 @@
4	target_alias = @target_alias@
5	SUBDIRS = include src tools test doc
6	EXTRA_DIST = HACKING iksemel.pc.in
7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = ${prefix}/libdata/pkgconfig
9	pkgconfig_DATA = iksemel.pc
10	all: all-recursive
11




--- ./configure.ac.orig	2009-07-23 11:16:36.000000000 +0000
+++ ./configure.ac	2009-10-21 11:57:12.768114881 +0000
@@ -45,7 +45,15 @@
 AC_CHECK_FUNCS(getopt_long)
 AC_CHECK_FUNCS(getaddrinfo)
 
-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
+dnl Check GNU TLS
+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) 
+if test "x$have_gnutls" = "xyes"; then
+  LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+  LIBGNUTLS_LIBS="$GNUTLS_LIBS"
+  AC_SUBST(LIBGNUTLS_CFLAGS)
+  AC_SUBST(LIBGNUTLS_LIBS)
+  AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) 
+fi
 
 dnl Check -Wall flag of GCC
 if test "x$GCC" = "xyes"; then




--- doc/Makefile.in.orig	2007-08-02 12:49:13.000000000 +0200
+++ doc/Makefile.in	2007-10-01 21:14:31.000000000 +0200
@@ -46,7 +46,7 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/iksemel
+INFO_DEPS = $(srcdir)/iksemel.info
 am__TEXINFO_TEX_DIR = $(srcdir)
 DVIS = iksemel.dvi
 PDFS = iksemel.pdf
@@ -207,7 +207,7 @@
 distclean-libtool:
 	-rm -f libtool
 
-$(srcdir)/iksemel: iksemel.texi 
+$(srcdir)/iksemel.info: iksemel.texi 
 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && cd $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \

Return to bug 139871

Lines 7-12 Link Here

(-)iksemel/Makefile (-2 / +12 lines)
7		7
8	PORTNAME= iksemel	8	PORTNAME= iksemel
9	PORTVERSION= 1.4	9	PORTVERSION= 1.4
		10	PORTREVISION= 1
10	CATEGORIES= textproc	11	CATEGORIES= textproc
11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
12		13
Lines 15-21 Link Here
15		16
16	LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls	17	LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
17		18
18	USE_AUTOTOOLS= libtool:22	19	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
		20	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
19	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
20	CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \	22	CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
21	LDFLAGS="-L${LOCALBASE}/lib"	23	LDFLAGS="-L${LOCALBASE}/lib"
Lines 23-26 Link Here
23		25
24	INFO= iksemel	26	INFO= iksemel
25		27
26	.include <bsd.port.mk>	28	.include <bsd.port.pre.mk>
		29
		30	post-patch:
		31	@${REINPLACE_CMD} -e 's\|@setfilename iksemel\|@setfilename iksemel.info\|' \
		32	${WRKSRC}/doc/iksemel.texi
		33	@${REINPLACE_CMD} -e 's\|pkgconfigdir=$$(libdir)/pkgconfig\|pkgconfigdir=$${prefix}/libdata/pkgconfig\|' \
		34	${WRKSRC}/Makefile.am
		35
		36	.include <bsd.port.post.mk>

Line 0 Link Here

(-)iksemel/files/patch-configure.ac (+19 lines)
	1	--- ./configure.ac.orig 2009-07-23 11:16:36.000000000 +0000
	2	+++ ./configure.ac 2009-10-21 11:57:12.768114881 +0000
	3	@@ -45,7 +45,15 @@
	4	AC_CHECK_FUNCS(getopt_long)
	5	AC_CHECK_FUNCS(getaddrinfo)
	6
	7	-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
	8	+dnl Check GNU TLS
	9	+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
	10	+if test "x$have_gnutls" = "xyes"; then
	11	+ LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
	12	+ LIBGNUTLS_LIBS="$GNUTLS_LIBS"
	13	+ AC_SUBST(LIBGNUTLS_CFLAGS)
	14	+ AC_SUBST(LIBGNUTLS_LIBS)
	15	+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
	16	+fi
	17
	18	dnl Check -Wall flag of GCC
	19	if test "x$GCC" = "xyes"; then

Lines 1-20 Link Here

(-)iksemel/files/patch-doc-Makefile.in (-20 lines)
1	--- doc/Makefile.in.orig 2007-08-02 12:49:13.000000000 +0200
2	+++ doc/Makefile.in 2007-10-01 21:14:31.000000000 +0200
3	@@ -46,7 +46,7 @@
4	CONFIG_CLEAN_FILES =
5	SOURCES =
6	DIST_SOURCES =
7	-INFO_DEPS = $(srcdir)/iksemel
8	+INFO_DEPS = $(srcdir)/iksemel.info
9	am__TEXINFO_TEX_DIR = $(srcdir)
10	DVIS = iksemel.dvi
11	PDFS = iksemel.pdf
12	@@ -207,7 +207,7 @@
13	distclean-libtool:
14	-rm -f libtool
15
16	-$(srcdir)/iksemel: iksemel.texi
17	+$(srcdir)/iksemel.info: iksemel.texi
18	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
19	am__cwd=`pwd` && cd $(srcdir) && \
20	rm -rf $$backupdir && mkdir $$backupdir && \