Date: Sun, 19 Jul 2009 19:58:08 +0200 (CEST) From: Rafael Ostertag <rafi@guengel.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/136910: [maintainer update] security/yapet: port update to 0.4_1 Message-ID: <200907191758.n6JHw8Dr074933@beastie.kruemel.home> Resent-Message-ID: <200907191800.n6JI0Fqs062884@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136910 >Category: ports >Synopsis: [maintainer update] security/yapet: port update to 0.4_1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jul 19 18:00:15 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Rafael Ostertag >Release: FreeBSD 7.2-RELEASE i386 >Organization: n/a >Environment: System: FreeBSD beastie.kruemel.home 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Wed May 6 18:24:52 CEST 2009 root@beastie.kruemel.home:/usr/obj/usr/src/sys/BEASTIE i386 >Description: Port update to version 0.4_1: Applies two patches to fix bugs. Additionally, applies patches from the files/ directory in order to honor the NOPORTDOCS make variable. Updated Files ------------- Makefile distinfo pkg-plist New Files --------- files/patch-Makefile.am files/patch-configure.ac files/patch-doc-Makefile.am Deleted Files ------------- (none) >How-To-Repeat: n/a >Fix: --- yapet-0.4_1.diff begins here --- diff -ruN yapet.bak/Makefile yapet/Makefile --- yapet.bak/Makefile 2009-07-19 14:11:35.000000000 +0200 +++ yapet/Makefile 2009-07-19 19:13:51.000000000 +0200 @@ -7,9 +7,14 @@ PORTNAME= yapet PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.guengel.ch/myapps/yapet/downloads/ http://homepage.hispeed.ch/rostertag/yapet/ +PATCH_SITES= http://www.guengel.ch/myapps/yapet/downloads/patches/ http://homepage.hispeed.ch/rostertag/yapet/patches/ +PATCHFILES= yapet_cfgfile-0.4.diff yapet_csv2yapet-0.4.diff +PATCH_DIST_STRIP= -p1 + MAINTAINER= rafi@guengel.ch COMMENT= A curses based password manager @@ -18,6 +23,8 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf:262 automake:110 aclocal:110 +ACLOCAL_ARGS= -I m4 OPTIONS= TTITLE "Enable Terminal Title" ON \ CSV2YAPET "Build csv2yapet" ON @@ -51,4 +58,14 @@ PLIST_SUB+= NLS="@comment " .endif +.if !defined(NOPORTDOCS) +CONFIGURE_ARGS+= --enable-install-doc +PLIST_SUB+= NOPORTDOCS="" +.else +CONFIGURE_ARGS+= --disable-install-doc +PLIST_SUB+= NOPORTDOCS="@comment " +.undef MAN1 +.undef MANCOMPRESSED +.endif + .include <bsd.port.post.mk> diff -ruN yapet.bak/distinfo yapet/distinfo --- yapet.bak/distinfo 2009-07-19 14:11:35.000000000 +0200 +++ yapet/distinfo 2009-07-19 14:27:46.000000000 +0200 @@ -1,3 +1,9 @@ MD5 (yapet-0.4.tar.gz) = 9efad0e6b5337b0171d77ee2bf9cecc9 SHA256 (yapet-0.4.tar.gz) = ae758cd0778e6f55e0dca63f22ce8bca3a77860646324d43ff09539d667d3ae2 SIZE (yapet-0.4.tar.gz) = 535666 +MD5 (yapet_cfgfile-0.4.diff) = 961fd692fb3554de2e7947e0bdb2afae +SHA256 (yapet_cfgfile-0.4.diff) = 38f14e88702a07264231924a9831e363332909c7cc0daa6af1f12e752e98250e +SIZE (yapet_cfgfile-0.4.diff) = 15064 +MD5 (yapet_csv2yapet-0.4.diff) = 80e8bd649174334b5748b2f9e70a4ce4 +SHA256 (yapet_csv2yapet-0.4.diff) = f71f5a51551f7e7d8fc69393b15e8a7157d71dae89ac617a9fb9b6ce423de86e +SIZE (yapet_csv2yapet-0.4.diff) = 157466 diff -ruN yapet.bak/files/patch-Makefile.am yapet/files/patch-Makefile.am --- yapet.bak/files/patch-Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ yapet/files/patch-Makefile.am 2009-07-19 17:32:28.000000000 +0200 @@ -0,0 +1,22 @@ +--- Makefile.am 2009-07-11 21:13:35.000000000 +0200 ++++ Makefile.am 2009-07-19 16:59:36.228663464 +0200 +@@ -1,7 +1,7 @@ + # + + AUTOMAKE_OPTIONS = check-news dist-bzip2 +-DISTCHECK_CONFIGURE_FLAGS = --enable-csv2yapet --enable-terminal-title --disable-source-doc ++DISTCHECK_CONFIGURE_FLAGS = --enable-csv2yapet --enable-terminal-title --disable-source-doc --enable-install-doc + + EXTRA_DIST = config.rpath m4/ChangeLog README.Cygwin MAINTAINER DESIGN LICENSE \ + INSTALL.generic Makefile.cvs yapet.desktop.in intl.h gettext.h BUGS +@@ -15,8 +15,10 @@ + desktopfile_DATA = yapet.desktop + desktopfiledir = $(datadir)/applications + ++if !DISABLEINSTALLDOC + textdoc_DATA = README COPYING AUTHORS DESIGN LICENSE + textdocdir = $(docdir) ++endif # !DISABLEINSTALLDOC + + editfile = $(SED) -e 's|@PACKAGE_STRING[@]|$(PACKAGE_STRING)|g' \ + -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ diff -ruN yapet.bak/files/patch-configure.ac yapet/files/patch-configure.ac --- yapet.bak/files/patch-configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ yapet/files/patch-configure.ac 2009-07-19 17:21:51.000000000 +0200 @@ -0,0 +1,33 @@ +--- configure.ac 2009-07-11 21:26:00.000000000 +0200 ++++ configure.ac 2009-07-19 16:49:39.328663575 +0200 +@@ -51,6 +51,14 @@ + [AS_HELP_STRING([--enable-build-doc],[enable the rebuild of the documentation (Requires xsltproc, lynx; Default: no)])], + [my_builddoc=$enableval], + [my_builddoc=no]) ++AC_ARG_ENABLE([install-doc], ++ [AS_HELP_STRING([--disable-install-doc],[disable the installation of the documentation (man pages, text and html files; Default: no)])], ++ [if test x$enableval = xno ; then ++ my_disableinstalldoc=yes ++ else ++ my_disableinstalldoc=no ++ fi], ++ [my_disableinstalldoc=no]) + AC_ARG_ENABLE([source-doc], + [AS_HELP_STRING([--enable-source-doc],[enable the build of the source code documentention (Requires doxygen; default: no)])], + [my_buildsourcedoc=$enableval], +@@ -180,6 +188,7 @@ + AM_CONDITIONAL([HAVEXSLTPROC], [test x$XSLTPROC != xno -a x$LYNX != xno]) + AM_CONDITIONAL([USE_INCLUDED_LIBINTL], [test x$USE_INCLUDED_LIBINTL = xyes]) + AM_CONDITIONAL([BUILDCSV2YAPET], [test x$my_buildcsv2yapet = xyes]) ++AM_CONDITIONAL([DISABLEINSTALLDOC], [test x$my_disableinstalldoc = xyes]) + AC_CONFIG_FILES([Makefile + intl/Makefile + po/Makefile.in +@@ -207,6 +216,7 @@ + echo "Docbook XSL : $DOCBOOKXSL" + echo "" + echo "Build Documentation : $my_builddoc" ++echo "Disable install Doc.: $my_disableinstalldoc" + echo "Build Source Doc. : $my_buildsourcedoc" + echo "Set Terminal Title : $my_settitle" + echo "Build csv2yapet : $my_buildcsv2yapet" \ No newline at end of file diff -ruN yapet.bak/files/patch-doc-Makefile.am yapet/files/patch-doc-Makefile.am --- yapet.bak/files/patch-doc-Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ yapet/files/patch-doc-Makefile.am 2009-07-19 17:32:13.000000000 +0200 @@ -0,0 +1,39 @@ +--- doc/Makefile.am 2009-07-12 12:55:26.000000000 +0200 ++++ doc/Makefile.am 2009-07-19 16:57:52.880643243 +0200 +@@ -1,16 +1,18 @@ + # + ++if !DISABLEINSTALLDOC + htmldoc_DATA = README.html DESIGN.html yapet.html + if BUILDCSV2YAPET + htmldoc_DATA += csv2yapet.html +-endif ++endif # BUILDCSV2YAPET + htmldocdir = $(docdir)/html + + dist_man1_MANS = yapet.1 + + if BUILDCSV2YAPET + dist_man1_MANS += csv2yapet.1 +-endif ++endif # BUILDCSV2YAPET ++endif # !DISABLEINSTALLDOC + + sed_files = README.sgml.in INSTALL.sgml.in DESIGN.sgml.in yapet.sgml.in \ + csv2yapet.sgml.in README.Cygwin.sgml.in +@@ -91,6 +93,7 @@ + + endif # HAVEDOXYGEN + ++if !DISABLEINSTALLDOC + if BUILDDOC + + if BUILDSOURCEDOC +@@ -106,6 +109,7 @@ + endif #BUILDSOURCEDOC + + endif # BUILDDOC ++endif # !DISABLEINSTALLDOC + + maintainer-clean-local: + rm -rf source-doc diff -ruN yapet.bak/pkg-plist yapet/pkg-plist --- yapet.bak/pkg-plist 2009-07-19 14:11:35.000000000 +0200 +++ yapet/pkg-plist 2009-07-19 18:30:59.000000000 +0200 @@ -1,15 +1,15 @@ bin/yapet %%CSV2YAPET%%bin/csv2yapet share/applications/yapet.desktop -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/DESIGN -%%DOCSDIR%%/README -%%DOCSDIR%%/LICENSE -%%DOCSDIR%%/html/DESIGN.html -%%DOCSDIR%%/html/README.html -%%DOCSDIR%%/html/yapet.html -%%CSV2YAPET%%%%DOCSDIR%%/html/csv2yapet.html +%%NOPORTDOCS%%%%DOCSDIR%%/AUTHORS +%%NOPORTDOCS%%%%DOCSDIR%%/COPYING +%%NOPORTDOCS%%%%DOCSDIR%%/DESIGN +%%NOPORTDOCS%%%%DOCSDIR%%/README +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%%%DOCSDIR%%/html/DESIGN.html +%%NOPORTDOCS%%%%DOCSDIR%%/html/README.html +%%NOPORTDOCS%%%%DOCSDIR%%/html/yapet.html +%%NOPORTDOCS%%%%CSV2YAPET%%%%DOCSDIR%%/html/csv2yapet.html %%NLS%%share/locale/de_AT/LC_MESSAGES/yapet.mo %%NLS%%share/locale/de_CH/LC_MESSAGES/yapet.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/yapet.mo @@ -17,6 +17,6 @@ @dirrmtry share/locale/de_DE @dirrmtry share/locale/de_CH/LC_MESSAGES @dirrmtry share/locale/de_CH -@dirrm %%DOCSDIR%%/html -@dirrm %%DOCSDIR%% +%%NOPORTDOCS%%@dirrm %%DOCSDIR%%/html +%%NOPORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications --- yapet-0.4_1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907191758.n6JHw8Dr074933>