<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115687] trunk/dports/sysutils/rpm</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115687">115687</a></dd>
<dt>Author</dt> <dd>afb@macports.org</dd>
<dt>Date</dt> <dd>2014-01-08 14:45:42 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>rpm: allow building with popt without la (#41697)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsrpmPortfile">trunk/dports/sysutils/rpm/Portfile</a></li>
<li><a href="#trunkdportssysutilsrpmfilespatchconfigure">trunk/dports/sysutils/rpm/files/patch-configure</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsrpmfilespatchMakefilein">trunk/dports/sysutils/rpm/files/patch-Makefile.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsrpmPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm/Portfile (115686 => 115687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm/Portfile 2014-01-08 22:38:52 UTC (rev 115686)
+++ trunk/dports/sysutils/rpm/Portfile 2014-01-08 22:45:42 UTC (rev 115687)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name rpm
</span><span class="cx"> version 4.4.9
</span><del>-revision 15
</del><ins>+revision 16
</ins><span class="cx"> platforms darwin freebsd linux
</span><span class="cx"> license GPL-2 LGPL-2
</span><span class="cx"> categories sysutils archivers
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> patch-configure \
</span><span class="cx"> patch-db3-configure \
</span><span class="cx"> patch-zlib-configure \
</span><ins>+ patch-Makefile.in \
</ins><span class="cx"> patch-Makefile.PL \
</span><span class="cx"> patch-darwin.prov \
</span><span class="cx"> patch-fts.c \
</span></span></pre></div>
<a id="trunkdportssysutilsrpmfilespatchMakefilein"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/rpm/files/patch-Makefile.in (0 => 115687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm/files/patch-Makefile.in (rev 0)
+++ trunk/dports/sysutils/rpm/files/patch-Makefile.in 2014-01-08 22:45:42 UTC (rev 115687)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- Makefile.in.orig 2007-05-19 21:32:14.000000000 +0200
++++ Makefile.in 2014-01-08 23:22:47.000000000 +0100
+@@ -458,13 +458,15 @@
+
+ staticLDFLAGS = # @LDFLAGS_STATIC@ # @LDFLAGS_NPTL@
+ myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+-myLDADD = \
++myLDADD_la = \
+ $(top_builddir)/lib/librpm.la \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(top_builddir)/rpmio/librpmio.la \
+- @WITH_POPT_LIB@ \
+ @WITH_ZLIB_LIB@ \
++
++myLDADD = $(myLDADD_la) \
++ @WITH_POPT_LIB@ \
+ @LIBMISC@
+
+ rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
+ bin_SCRIPTS = gendiff
+@@ -1160,7 +1161,7 @@
+ rpmq.o: $(top_srcdir)/rpmqv.c
+ $(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $<
+
+-$(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@
++$(PROGRAMS): $(myLDADD_la) @WITH_APIDOCS_TARGET@
+
+ .PHONY: splint
+ splint:
</ins></span></pre></div>
<a id="trunkdportssysutilsrpmfilespatchconfigure"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/rpm/files/patch-configure (115686 => 115687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/rpm/files/patch-configure 2014-01-08 22:38:52 UTC (rev 115686)
+++ trunk/dports/sysutils/rpm/files/patch-configure 2014-01-08 22:45:42 UTC (rev 115687)
</span><span class="lines">@@ -9,25 +9,12 @@
</span><span class="cx"> fi
</span><span class="cx"> export CFLAGS LDFLAGS
</span><span class="cx">
</span><del>-@@ -27309,8 +27309,8 @@
- if test $ac_cv_lib_popt_poptGetContext = yes; then
</del><ins>+@@ -27546,7 +27546,7 @@
</ins><span class="cx">
</span><del>- WITH_POPT_SUBDIR=
-- WITH_POPT_INCLUDE=
-- WITH_POPT_LIB="-lpopt"
-+ WITH_POPT_INCLUDE='-I${prefix}/include'
-+ WITH_POPT_LIB='${prefix}/lib/libpopt.la'
-
- fi
-
-@@ -27545,8 +27545,8 @@
- _ACEOF
-
</del><span class="cx"> WITH_SQLITE3_SUBDIR=
</span><del>-- WITH_SQLITE3_INCLUDE=
</del><ins>+ WITH_SQLITE3_INCLUDE=
</ins><span class="cx"> - WITH_SQLITE3_LIB="-lsqlite"
</span><del>-+ WITH_SQLITE3_INCLUDE='-I${prefix}/include'
-+ WITH_SQLITE3_LIB='${prefix}/lib/libsqlite3.la'
</del><ins>++ WITH_SQLITE3_LIB="-lsqlite3"
</ins><span class="cx"> DBLIBSRCS="$DBLIBSRCS sqlite.c"
</span><span class="cx">
</span><span class="cx"> fi
</span></span></pre>
</div>
</div>
</body>
</html>