<!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>[139915] trunk/dports/sysutils/mkpwd</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/139915">139915</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-09-01 16:16:19 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mkpwd: update to 1.6. Patch submitted by a user. Simplify Portfile. Add patches to remove linking against libcrypt.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsmkpwdPortfile">trunk/dports/sysutils/mkpwd/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsmkpwdfilespatchMakefileamdiff">trunk/dports/sysutils/mkpwd/files/patch-Makefile.am.diff</a></li>
<li><a href="#trunkdportssysutilsmkpwdfilespatchMakefileindiff">trunk/dports/sysutils/mkpwd/files/patch-Makefile.in.diff</a></li>
<li><a href="#trunkdportssysutilsmkpwdfilespatchconfigurediff">trunk/dports/sysutils/mkpwd/files/patch-configure.diff</a></li>
<li><a href="#trunkdportssysutilsmkpwdfilespatchmkpwd1diff">trunk/dports/sysutils/mkpwd/files/patch-mkpwd.1.diff</a></li>
<li><a href="#trunkdportssysutilsmkpwdfilespatchmkpwdcdiff">trunk/dports/sysutils/mkpwd/files/patch-mkpwd.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsmkpwdfilespatchMakefile">trunk/dports/sysutils/mkpwd/files/patch-Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsmkpwdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/mkpwd/Portfile (139914 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/Portfile 2015-09-01 21:53:22 UTC (rev 139914)
+++ trunk/dports/sysutils/mkpwd/Portfile 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name mkpwd
</span><del>-version 0.8
</del><ins>+version 1.6
</ins><span class="cx"> categories sysutils
</span><span class="cx"> license Permissive
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -16,29 +16,15 @@
</span><span class="cx"> homepage http://www.o-schroeder.de/
</span><span class="cx"> master_sites ${homepage}/download/${name}/
</span><span class="cx">
</span><del>-extract.suffix .tgz
-set real_version [strsed ${version} {s/\./\-/}]
-distname ${name}-${real_version}
</del><ins>+checksums rmd160 a438113a4fc823ae9e884c1d530fbe5689077432 \
+ sha256 6db5032fa6e2bc3ebd499ebf2b94f8df5b3ce64760d84fda7101e951bfb5c88a
</ins><span class="cx">
</span><del>-checksums rmd160 5bf94e92414366592573f8a92776ed2ae6b80395 \
- sha256 352315e531d82f6e975fe135f31505b4c356256c26da1f0303c4f01f70779a62
</del><ins>+patchfiles patch-configure.diff \
+ patch-Makefile.am.diff \
+ patch-Makefile.in.diff \
+ patch-mkpwd.c.diff \
+ patch-mkpwd.1.diff
</ins><span class="cx">
</span><del>-depends_build-append port:cctools
-
-worksrcdir ${name}
-
-patchfiles patch-Makefile
-
-use_configure no
-
-variant universal {}
-
-build.target
-build.args-append CC="${configure.cc} [get_canonical_archflags cc]"
-
-destroot.args PREFIX=${prefix}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><del>-livecheck.regex ${name}-(\[0-9.\]-\[0-9.\]+)\\${extract.suffix}
-livecheck.version ${real_version}
</del><ins>+livecheck.regex ${name}-(\[0-9.\].\[0-9.\]+)\\${extract.suffix}
</ins></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/mkpwd/files/patch-Makefile (139914 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-Makefile 2015-09-01 21:53:22 UTC (rev 139914)
+++ trunk/dports/sysutils/mkpwd/files/patch-Makefile 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- Makefile 2015-08-24 23:22:48.000000000 -0400
-+++ Makefile 2015-08-24 23:23:24.000000000 -0400
-@@ -3,22 +3,22 @@
- #################################################
-
- # where the binary should be installed
--DIR_INSTALL = /usr/bin
-+DIR_INSTALL = $(DESTDIR)$(PREFIX)/bin
- # where the manpage goes
--MAN_INSTALL = /usr/man/man1
-+MAN_INSTALL = $(DESTDIR)$(PREFIX)/share/man/man1
-
- PRG = mkpwd
- SRC = mkpwd.c
- OBJ = mkpwd.o
- MAN = mkpwd.1
-
--CC = gcc
-+#CC = gcc
- # FLAGS = -g
--LDFLAGS = -lcrypt
-+LDFLAGS =
-
- $(PRG): $(OBJ)
- $(CC) -o $(PRG) $(OBJ) $(LDFLAGS)
-- strip --strip-all $(PRG)
-+ strip $(PRG)
-
- $(OBJ): $(SRC)
- $(CC) $(FLAGS) -c $(SRC)
</del></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchMakefileamdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/mkpwd/files/patch-Makefile.am.diff (0 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/sysutils/mkpwd/files/patch-Makefile.am.diff 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- Makefile.am.orig 2015-08-31 17:04:38.000000000 -0400
++++ Makefile.am 2015-08-31 17:06:51.000000000 -0400
+@@ -5,6 +5,6 @@
+ bin_PROGRAMS = mkpwd
+ mkpwd_SOURCES = mkpwd.c
+ man_MANS = mkpwd.1
+-LIBS = -lcrypt @LIBS@
++LIBS = @LIBS@
+
+ EXTRA_DIST = README mkpwd.1
</ins></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/mkpwd/files/patch-Makefile.in.diff (0 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/sysutils/mkpwd/files/patch-Makefile.in.diff 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- Makefile.in.orig 2015-08-31 17:04:27.000000000 -0400
++++ Makefile.in 2015-08-31 17:04:58.000000000 -0400
+@@ -162,7 +162,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = -lcrypt @LIBS@
++LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKE = @MAKE@
+ MAKEINFO = @MAKEINFO@
+@@ -272,7 +272,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+@@ -319,7 +319,7 @@
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-mkpwd$(EXEEXT): $(mkpwd_OBJECTS) $(mkpwd_DEPENDENCIES) $(EXTRA_mkpwd_DEPENDENCIES)
++mkpwd$(EXEEXT): $(mkpwd_OBJECTS) $(mkpwd_DEPENDENCIES) $(EXTRA_mkpwd_DEPENDENCIES)
+ @rm -f mkpwd$(EXEEXT)
+ $(LINK) $(mkpwd_OBJECTS) $(mkpwd_LDADD) $(LIBS)
+
</ins></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/mkpwd/files/patch-configure.diff (0 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-configure.diff (rev 0)
+++ trunk/dports/sysutils/mkpwd/files/patch-configure.diff 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- configure.orig 2015-08-31 17:14:24.000000000 -0400
++++ configure 2015-08-31 17:14:38.000000000 -0400
+@@ -3506,7 +3506,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypt $LIBS"
++LIBS=" $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -5013,4 +5013,3 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
</ins></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchmkpwd1diff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/mkpwd/files/patch-mkpwd.1.diff (0 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-mkpwd.1.diff (rev 0)
+++ trunk/dports/sysutils/mkpwd/files/patch-mkpwd.1.diff 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+--- mkpwd.1.orig 2015-08-31 18:03:04.000000000 -0400
++++ mkpwd.1 2015-08-31 18:06:34.000000000 -0400
+@@ -11,7 +11,7 @@
+ ]
+ .SH INTRODUCTION
+ .B mkpwd
+-prints a randomly generated password to stdout. If
++prints a randomly generated password to stdout. If
+ .B count
+ is provided, mkpwd will generate count-numbers of passwords and
+ print them to stdout.
+@@ -31,31 +31,31 @@
+ .B \-\-help
+ Print out short help and exit. All other options are ignored.
+ .TP
+-.B \-\-min length
++.B \-\-n length
+ .B length
+ must be an integer number. mkpwd will only generate passwords
+ with the given minimum length.
+ .TP
+-.B \-\-max length
++.B \-m length
+ .B length
+ must be an integer number. mkpwd will only generate passwords with the
+ given maximum length.
+ .TP
+-.B \-\-uppercase
++.B \-u
+ generate password with uppercase characters. This only affects characters
+ of the US-alphabet.
+ .TP
+-.B \-\-lowercase
++.B \-l
+ generate password with lowercase characters. This only affects characters
+ of the US-alphabet.
+ .TP
+-.B \-\-crypt salt
++.B \-c salt
+ .B salt
+ must be a string of two characters. Every generated password is passed to
+ the crypt()-function and the result is printed right after the password itself.
+ Please read the manpage of crypt(3) for more information.
+ .TP
+-.B \-\-type X
++.B \-t X
+ .B X
+ must be an integer value between 1 and 7. It specifies the way passwords
+ are created. The following types are defined:
+@@ -75,23 +75,23 @@
+ .sp
+
+ The standard type is 1 (complex). If you use the type "alphanum-readable"
+-the password is build of the characters [A-Z] and [a-z]. There is a 10%
++the password is build of the characters [A-Z] and [a-z]. There is a 10%
+ chance per character for it to become a number [0-9].
+ The type "alpha-readable" is the same execpt that no numbers get used.
+ Both types try to generate a readable password. This is implemented by
+ alternatingly using a consonant and a vocal character.
+
+ .SH NOTICE
+-The gnu getopt() is really anoying. The arguments to options must be
++The gnu getopt() is really anoying. The arguments to options must be
+ supplied by a equal-sign. You can not use something like "--crypt SA".
+ Use "--crypt=SA" instead. This is a strange behavior of getopt() while
+ processing arguments which may have an argument.
+
+ .SH EXAMPLE
+-The following generates 10 passwords consisting only of lowercase
++The following generates 10 passwords consisting only of lowercase
+ alphabetic characters:
+
+- mkpwd --lowercase --type 3 10
++ mkpwd -l -t 3 10
+
+ .SH AUTHOR
+ (c) 1999-2002 by Oliver Schroeder <post@o-schroeder.de>
+@@ -99,4 +99,3 @@
+ .B mkpwd
+ stands under a BSD like license. See the copyright notice in the source
+ file for more information.
+-
</ins></span></pre></div>
<a id="trunkdportssysutilsmkpwdfilespatchmkpwdcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/mkpwd/files/patch-mkpwd.c.diff (0 => 139915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/mkpwd/files/patch-mkpwd.c.diff (rev 0)
+++ trunk/dports/sysutils/mkpwd/files/patch-mkpwd.c.diff 2015-09-01 23:16:19 UTC (rev 139915)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+--- mkpwd.c.orig 2015-08-31 17:25:15.000000000 -0400
++++ mkpwd.c 2015-08-31 17:25:25.000000000 -0400
+@@ -7,11 +7,11 @@
+ ** Copyright 1999-2003 Oliver Schroeder
+ **
+ ** Permission to use, copy, modify, and distribute this
+-** software and its documentation for any purpose and
+-** without any fee is hereby granted, provided that the
+-** above copyright notice and this permission notice
+-** appear in all copies of the software and derivative
+-** works or modified versions thereof, and that both the
++** software and its documentation for any purpose and
++** without any fee is hereby granted, provided that the
++** above copyright notice and this permission notice
++** appear in all copies of the software and derivative
++** works or modified versions thereof, and that both the
+ ** copyright notice and this permission and disclaimer
+ ** notice appear in supporting documentation.
+ **
+@@ -28,7 +28,7 @@
+ #include <errno.h>
+
+ const char* PROGRAM = "mkpwd";
+-const char* VERSION = "0.8";
++const char* VERSION = "1.6";
+ const char* COPYRIGHT = "(c) 1999-2010 Oliver Schroeder";
+
+ /*********************************************************************
+@@ -150,7 +150,7 @@
+ extern int optind, opterr;
+ int option_index = 0;
+ int c;
+-
++
+ c = 1;
+ opterr = 0;
+ while (c != EOF)
</ins></span></pre>
</div>
</div>
</body>
</html>