Bug 122394 - [patch] polish/libgadu fix for dependent polish/gnugadu2
Summary: [patch] polish/libgadu fix for dependent polish/gnugadu2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Felippe de Meirelles Motta
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-04-03 01:40 UTC by Aleksander Fafula
Modified: 2008-05-17 16:25 UTC (History)
0 users

See Also:


Attachments
file.diff (1.33 KB, patch)
2008-04-03 01:40 UTC, Aleksander Fafula
no flags Details | Diff
libgadu.txt (963 bytes, text/plain)
2008-04-03 01:54 UTC, aleksander.fafula
no flags Details
libgadu.txt (963 bytes, text/plain)
2008-04-15 14:26 UTC, aleksander.fafula
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Aleksander Fafula 2008-04-03 01:40:01 UTC
Gnugadu2 fails to compile after last libgadu change. They both use pkgconfig which does not like OpenSSL from basesystem. This patch contains the solution.

Previous PR that enabled OpenSSL support http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/121303 . Now we need to disable "Require: openssl" in ${PREFIX}/libdata/pkgconfig/libgadu.pc .

Fix: Apply patch.

Patch attached with submission follows:
Comment 1 Felippe de Meirelles Motta freebsd_committer freebsd_triage 2008-04-03 01:49:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lippe

I'll take it.
Comment 2 Felippe de Meirelles Motta 2008-04-04 04:45:25 UTC
Em Thu, 3 Apr 2008 01:20:04 GMT
"Aleksander Fafula" <aleksander.fafula@gmail.com> escreveu:

>  Sorry! Wrong patch attached. This one is ok!


Hi Aleksander,

I think that your patch was not attached correctly, please re-send it.

Thanks!

-- 
lippe@FreeBSD.org
Felippe de Meirelles Motta
Comment 3 aleksander.fafula 2008-04-15 14:26:33 UTC
Resend / patch:

diff -ruN libgadu.orig/Makefile libgadu/Makefile
--- libgadu.orig/Makefile	2008-03-25 19:45:09.000000000 +0100
+++ libgadu/Makefile	2008-04-03 03:25:45.334398683 +0200
@@ -6,6 +6,7 @@

 PORTNAME=	libgadu
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	polish net
 MASTER_SITES=	http://toxygen.net/libgadu/files/
@@ -23,16 +24,26 @@

 USE_LDCONFIG=		yes

+OPTIONS=	OPENSSL "Build with OPENSSL support" on
+
 PLIST_FILES=	include/libgadu.h \
 		lib/libgadu.la \
 		lib/libgadu.so \
 		lib/libgadu.so.3 \
 		libdata/pkgconfig/libgadu.pc

-OPTIONS=	OPENSSL "Build with OPENSSL support" on
+.include <bsd.port.pre.mk>

-.if defined(WITHOUT_OPENSSL)
+.if defined(WITH_OPENSSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.else
 CONFIGURE_ARGS+=	--without-openssl
 .endif

-.include <bsd.port.mk>
+pre-install:
+
+.if defined(WITH_OPENSSL)
+	@${REINPLACE_CMD} -e 's|openssl| |g' ${WRKSRC}/pkgconfig/libgadu.pc
+.endif
+
+.include <bsd.port.post.mk>
Comment 4 Felippe de Meirelles Motta freebsd_committer freebsd_triage 2008-05-09 03:06:56 UTC
State Changed
From-To: open->closed

Committed earlier by myself, look ports/121303. Thanks!
Comment 5 Felippe de Meirelles Motta freebsd_committer freebsd_triage 2008-05-15 21:42:36 UTC
State Changed
From-To: closed->open

The problem was not completely solved, according to feedback from 
polishgnugadu2 maintainer. Re-opened to try to fix it. Sorry for my 
confusion.
Comment 6 dfilter service freebsd_committer freebsd_triage 2008-05-17 16:12:20 UTC
lippe       2008-05-17 15:12:15 UTC

  FreeBSD ports repository

  Modified files:
    polish/libgadu       Makefile 
  Log:
  - Fix SSL bug and unbreak polish/gnugadu2 too.
  
  PR:             ports/122394
  Submitted by:   "Aleksander Fafula" <aleksander.fafula@gmail.com>
  Approved by:    araujo (mentor), maintainer timeout (> 2 weeks)
  
  Revision  Changes    Path
  1.8       +14 -3     ports/polish/libgadu/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Felippe de Meirelles Motta freebsd_committer freebsd_triage 2008-05-17 16:25:26 UTC
State Changed
From-To: open->closed

Committed. Thanks!