Don't depend on base OpenSSL when using WITH_OPENSSL_PORT.

PR:		ports/186978
Submitted by:	Bernard Spil
This commit is contained in:
Chris Rees 2015-07-03 21:43:13 +00:00
parent 45b8a4f40a
commit b15e867cfe
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=391278
2 changed files with 15 additions and 4 deletions

View File

@ -0,0 +1,11 @@
--- daemon/Makefile.in.orig 2015-04-15 08:35:09 UTC
+++ daemon/Makefile.in
@@ -141,7 +141,7 @@ am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ $(LDFLAGS) $(AM_LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;

View File

@ -1,6 +1,6 @@
--- qt/mainwin.cc.orig 2014-07-21 14:31:59.381934558 +0100
+++ qt/mainwin.cc 2014-07-21 14:35:42.020934743 +0100
@@ -1165,8 +1165,8 @@
--- qt/mainwin.cc.orig 2014-07-01 17:09:14 UTC
+++ qt/mainwin.cc
@@ -1165,8 +1165,8 @@ TrMainWindow :: openTorrent ()
QCheckBox * b = new QCheckBox (tr ("Show &options dialog"));
b->setChecked (myPrefs.getBool (Prefs::OPTIONS_PROMPT));
b->setObjectName (SHOW_OPTIONS_CHECKBOX_NAME);
@ -11,7 +11,7 @@
{
l = new QGridLayout;
d->setLayout (l);
@@ -1313,8 +1313,8 @@
@@ -1313,8 +1313,8 @@ TrMainWindow :: removeTorrents (const bo
msgBox.setDefaultButton (QMessageBox::Cancel);
msgBox.setIcon (QMessageBox::Question);
// hack needed to keep the dialog from being too narrow