Attachment #96702 for bug #135363

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

Lines 6-12 Link Here

(-)ftwin/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= ftwin	8	PORTNAME= ftwin
9	PORTVERSION= 0.8.3	9	PORTVERSION= 0.8.5
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://download.meroware.org/ftwin/	11	MASTER_SITES= http://download.meroware.org/ftwin/
12		12
Lines 20-26 Link Here
20	USE_BZIP2= yes	20	USE_BZIP2= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	USE_AUTOTOOLS= autoconf:262 aclocal:110 automake:110 autoheader:262	22	USE_AUTOTOOLS= autoconf:262 aclocal:110 automake:110 autoheader:262
23	CONFIGURE_ARGS+= --with-check=${LOCALBASE} --with-puzzle=${LOCALBASE}	23	CONFIGURE_ARGS+= --with-puzzle=${LOCALBASE}
24	PLIST_FILES= bin/ftwin	24	PLIST_FILES= bin/ftwin
25		25
26	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes

Lines 1-3 Link Here

(-)ftwin/distinfo (-3 / +3 lines)
1	MD5 (ftwin-0.8.3.tar.bz2) = dae682c8f4805f7c25935bf422fc1893	1	MD5 (ftwin-0.8.5.tar.bz2) = 01a3c91156c8f6fc2a116c426f0af25e
2	SHA256 (ftwin-0.8.3.tar.bz2) = b2ed0685f1dcd620de306a29b7529bf66185a193ae4df426e4b77c740b4e92bd	2	SHA256 (ftwin-0.8.5.tar.bz2) = 03dec36503b3c781f287b4427e99d9d1ccc704f1d9e11eadcd630e4c29dea0ce
3	SIZE (ftwin-0.8.3.tar.bz2) = 164160	3	SIZE (ftwin-0.8.5.tar.bz2) = 164234




--- ./acinclude.m4.orig	2008-11-03 18:03:37.000000000 +0100
+++ ./acinclude.m4	2009-06-08 11:04:57.456599653 +0200
@@ -141,8 +141,8 @@
     ])
 

 		AC_CHECK_LIB(puzzle, puzzle_init_context,
 		    [
 		     AC_DEFINE([HAVE_PUZZLE], 1, [for image comparison mode])
@@ -216,16 +218,18 @@
 	    # Make sure we have "archive.h".  If we don't, it means we probably
 	    # don't have libarchive, so don't use it.
 	    #

 	    AC_CHECK_HEADER(archive.h,
 		[
 		# Check if the lib is OK
+		LDFLAGS="$LDFLAGS -L$archive/lib -lmd -lcrypto"
 		AC_CHECK_LIB(archive, archive_version,
 		    [
 		     AC_DEFINE([HAVE_ARCHIVE], 1, [for inside archive comparison mode])
 		     with_archive=yes
 		     ARCHIVE_CPPFLAGS="-I$archive/include"
 		     ARCHIVE_LDFLAGS="-L$archive/lib"
-		     ARCHIVE_LDADD="-larchive"
+		     ARCHIVE_LDADD="-larchive -lmd -lcrypto"
 		    ],
 		    [
 		     with_archive=no

Return to bug 135363

Lines 1-5 Link Here

(-)ftwin/files/patch-acinclude-check-cflags-ldflags (-4 / +12 lines)
1	--- acinclude.m4.orig 2007-12-07 23:19:51.000000000 +0100	1	--- ./acinclude.m4.orig 2008-11-03 18:03:37.000000000 +0100
2	+++ acinclude.m4 2007-12-18 14:29:44.000000000 +0100	2	+++ ./acinclude.m4 2009-06-08 11:04:57.456599653 +0200
3	@@ -141,8 +141,8 @@	3	@@ -141,8 +141,8 @@
4	])	4	])
5		5
Lines 23-29 Link Here
23	AC_CHECK_LIB(puzzle, puzzle_init_context,	23	AC_CHECK_LIB(puzzle, puzzle_init_context,
24	[	24	[
25	AC_DEFINE([HAVE_PUZZLE], 1, [for image comparison mode])	25	AC_DEFINE([HAVE_PUZZLE], 1, [for image comparison mode])
26	@@ -216,9 +218,11 @@	26	@@ -216,16 +218,18 @@
27	# Make sure we have "archive.h". If we don't, it means we probably	27	# Make sure we have "archive.h". If we don't, it means we probably
28	# don't have libarchive, so don't use it.	28	# don't have libarchive, so don't use it.
29	#	29	#
Lines 31-37 Link Here
31	AC_CHECK_HEADER(archive.h,	31	AC_CHECK_HEADER(archive.h,
32	[	32	[
33	# Check if the lib is OK	33	# Check if the lib is OK
34	+ LDFLAGS="$LDFLAGS -L$archive/lib"	34	+ LDFLAGS="$LDFLAGS -L$archive/lib -lmd -lcrypto"
35	AC_CHECK_LIB(archive, archive_version,	35	AC_CHECK_LIB(archive, archive_version,
36	[	36	[
37	AC_DEFINE([HAVE_ARCHIVE], 1, [for inside archive comparison mode])	37	AC_DEFINE([HAVE_ARCHIVE], 1, [for inside archive comparison mode])
		38	with_archive=yes
		39	ARCHIVE_CPPFLAGS="-I$archive/include"
		40	ARCHIVE_LDFLAGS="-L$archive/lib"
		41	- ARCHIVE_LDADD="-larchive"
		42	+ ARCHIVE_LDADD="-larchive -lmd -lcrypto"
		43	],
		44	[
		45	with_archive=no