Attachment #98072 for bug #136910

View | Details | Raw Unified | Return to bug 136910
Collapse All | Expand All

Lines 7-15 Link Here

(-)yapet/Makefile (+17 lines)
7		7
8	PORTNAME= yapet	8	PORTNAME= yapet
9	PORTVERSION= 0.4	9	PORTVERSION= 0.4
		10	PORTREVISION= 1
10	CATEGORIES= security	11	CATEGORIES= security
11	MASTER_SITES= http://www.guengel.ch/myapps/yapet/downloads/ http://homepage.hispeed.ch/rostertag/yapet/	12	MASTER_SITES= http://www.guengel.ch/myapps/yapet/downloads/ http://homepage.hispeed.ch/rostertag/yapet/
12		13
		14	PATCH_SITES= http://www.guengel.ch/myapps/yapet/downloads/patches/ http://homepage.hispeed.ch/rostertag/yapet/patches/
		15	PATCHFILES= yapet_cfgfile-0.4.diff yapet_csv2yapet-0.4.diff
		16	PATCH_DIST_STRIP= -p1
		17
13	MAINTAINER= rafi@guengel.ch	18	MAINTAINER= rafi@guengel.ch
14	COMMENT= A curses based password manager	19	COMMENT= A curses based password manager
15		20
Lines 18-23 Link Here
18		23
19	USE_OPENSSL= yes	24	USE_OPENSSL= yes
20	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
		26	USE_AUTOTOOLS= autoconf:262 automake:110 aclocal:110
		27	ACLOCAL_ARGS= -I m4
21		28
22	OPTIONS= TTITLE "Enable Terminal Title" ON \	29	OPTIONS= TTITLE "Enable Terminal Title" ON \
23	CSV2YAPET "Build csv2yapet" ON	30	CSV2YAPET "Build csv2yapet" ON
Lines 51-54 Link Here
51	PLIST_SUB+= NLS="@comment "	58	PLIST_SUB+= NLS="@comment "
52	.endif	59	.endif
53		60
		61	.if !defined(NOPORTDOCS)
		62	CONFIGURE_ARGS+= --enable-install-doc
		63	PLIST_SUB+= NOPORTDOCS=""
		64	.else
		65	CONFIGURE_ARGS+= --disable-install-doc
		66	PLIST_SUB+= NOPORTDOCS="@comment "
		67	.undef MAN1
		68	.undef MANCOMPRESSED
		69	.endif
		70
54	.include <bsd.port.post.mk>	71	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)yapet/distinfo (+6 lines)
1	MD5 (yapet-0.4.tar.gz) = 9efad0e6b5337b0171d77ee2bf9cecc9	1	MD5 (yapet-0.4.tar.gz) = 9efad0e6b5337b0171d77ee2bf9cecc9
2	SHA256 (yapet-0.4.tar.gz) = ae758cd0778e6f55e0dca63f22ce8bca3a77860646324d43ff09539d667d3ae2	2	SHA256 (yapet-0.4.tar.gz) = ae758cd0778e6f55e0dca63f22ce8bca3a77860646324d43ff09539d667d3ae2
3	SIZE (yapet-0.4.tar.gz) = 535666	3	SIZE (yapet-0.4.tar.gz) = 535666
		4	MD5 (yapet_cfgfile-0.4.diff) = 961fd692fb3554de2e7947e0bdb2afae
		5	SHA256 (yapet_cfgfile-0.4.diff) = 38f14e88702a07264231924a9831e363332909c7cc0daa6af1f12e752e98250e
		6	SIZE (yapet_cfgfile-0.4.diff) = 15064
		7	MD5 (yapet_csv2yapet-0.4.diff) = 80e8bd649174334b5748b2f9e70a4ce4
		8	SHA256 (yapet_csv2yapet-0.4.diff) = f71f5a51551f7e7d8fc69393b15e8a7157d71dae89ac617a9fb9b6ce423de86e
		9	SIZE (yapet_csv2yapet-0.4.diff) = 157466




--- 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' \




--- 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"




--- 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




bin/yapet
%%CSV2YAPET%%bin/csv2yapet
share/applications/yapet.desktop
%%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

@dirrmtry share/locale/de_DE
@dirrmtry share/locale/de_CH/LC_MESSAGES
@dirrmtry share/locale/de_CH
%%NOPORTDOCS%%@dirrm %%DOCSDIR%%/html
%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications

Return to bug 136910

Line 0 Link Here

(-)yapet/files/patch-Makefile.am (+22 lines)
	1	--- Makefile.am 2009-07-11 21:13:35.000000000 +0200
	2	+++ Makefile.am 2009-07-19 16:59:36.228663464 +0200
	3	@@ -1,7 +1,7 @@
	4	#
	5
	6	AUTOMAKE_OPTIONS = check-news dist-bzip2
	7	-DISTCHECK_CONFIGURE_FLAGS = --enable-csv2yapet --enable-terminal-title --disable-source-doc
	8	+DISTCHECK_CONFIGURE_FLAGS = --enable-csv2yapet --enable-terminal-title --disable-source-doc --enable-install-doc
	9
	10	EXTRA_DIST = config.rpath m4/ChangeLog README.Cygwin MAINTAINER DESIGN LICENSE \
	11	INSTALL.generic Makefile.cvs yapet.desktop.in intl.h gettext.h BUGS
	12	@@ -15,8 +15,10 @@
	13	desktopfile_DATA = yapet.desktop
	14	desktopfiledir = $(datadir)/applications
	15
	16	+if !DISABLEINSTALLDOC
	17	textdoc_DATA = README COPYING AUTHORS DESIGN LICENSE
	18	textdocdir = $(docdir)
	19	+endif # !DISABLEINSTALLDOC
	20
	21	editfile = $(SED) -e 's\|@PACKAGE_STRING[@]\|$(PACKAGE_STRING)\|g' \
	22	-e 's\|@PACKAGE_VERSION[@]\|$(PACKAGE_VERSION)\|g' \

Line 0 Link Here

(-)yapet/files/patch-configure.ac (+33 lines)
	1	--- configure.ac 2009-07-11 21:26:00.000000000 +0200
	2	+++ configure.ac 2009-07-19 16:49:39.328663575 +0200
	3	@@ -51,6 +51,14 @@
	4	[AS_HELP_STRING([--enable-build-doc],[enable the rebuild of the documentation (Requires xsltproc, lynx; Default: no)])],
	5	[my_builddoc=$enableval],
	6	[my_builddoc=no])
	7	+AC_ARG_ENABLE([install-doc],
	8	+ [AS_HELP_STRING([--disable-install-doc],[disable the installation of the documentation (man pages, text and html files; Default: no)])],
	9	+ [if test x$enableval = xno ; then
	10	+ my_disableinstalldoc=yes
	11	+ else
	12	+ my_disableinstalldoc=no
	13	+ fi],
	14	+ [my_disableinstalldoc=no])
	15	AC_ARG_ENABLE([source-doc],
	16	[AS_HELP_STRING([--enable-source-doc],[enable the build of the source code documentention (Requires doxygen; default: no)])],
	17	[my_buildsourcedoc=$enableval],
	18	@@ -180,6 +188,7 @@
	19	AM_CONDITIONAL([HAVEXSLTPROC], [test x$XSLTPROC != xno -a x$LYNX != xno])
	20	AM_CONDITIONAL([USE_INCLUDED_LIBINTL], [test x$USE_INCLUDED_LIBINTL = xyes])
	21	AM_CONDITIONAL([BUILDCSV2YAPET], [test x$my_buildcsv2yapet = xyes])
	22	+AM_CONDITIONAL([DISABLEINSTALLDOC], [test x$my_disableinstalldoc = xyes])
	23	AC_CONFIG_FILES([Makefile
	24	intl/Makefile
	25	po/Makefile.in
	26	@@ -207,6 +216,7 @@
	27	echo "Docbook XSL : $DOCBOOKXSL"
	28	echo ""
	29	echo "Build Documentation : $my_builddoc"
	30	+echo "Disable install Doc.: $my_disableinstalldoc"
	31	echo "Build Source Doc. : $my_buildsourcedoc"
	32	echo "Set Terminal Title : $my_settitle"
	33	echo "Build csv2yapet : $my_buildcsv2yapet"

Line 0 Link Here

(-)yapet/files/patch-doc-Makefile.am (+39 lines)
	1	--- doc/Makefile.am 2009-07-12 12:55:26.000000000 +0200
	2	+++ doc/Makefile.am 2009-07-19 16:57:52.880643243 +0200
	3	@@ -1,16 +1,18 @@
	4	#
	5
	6	+if !DISABLEINSTALLDOC
	7	htmldoc_DATA = README.html DESIGN.html yapet.html
	8	if BUILDCSV2YAPET
	9	htmldoc_DATA += csv2yapet.html
	10	-endif
	11	+endif # BUILDCSV2YAPET
	12	htmldocdir = $(docdir)/html
	13
	14	dist_man1_MANS = yapet.1
	15
	16	if BUILDCSV2YAPET
	17	dist_man1_MANS += csv2yapet.1
	18	-endif
	19	+endif # BUILDCSV2YAPET
	20	+endif # !DISABLEINSTALLDOC
	21
	22	sed_files = README.sgml.in INSTALL.sgml.in DESIGN.sgml.in yapet.sgml.in \
	23	csv2yapet.sgml.in README.Cygwin.sgml.in
	24	@@ -91,6 +93,7 @@
	25
	26	endif # HAVEDOXYGEN
	27
	28	+if !DISABLEINSTALLDOC
	29	if BUILDDOC
	30
	31	if BUILDSOURCEDOC
	32	@@ -106,6 +109,7 @@
	33	endif #BUILDSOURCEDOC
	34
	35	endif # BUILDDOC
	36	+endif # !DISABLEINSTALLDOC
	37
	38	maintainer-clean-local:
	39	rm -rf source-doc

Lines 1-15 Link Here

(-)yapet/pkg-plist (-11 / +11 lines)
1	bin/yapet	1	bin/yapet
2	%%CSV2YAPET%%bin/csv2yapet	2	%%CSV2YAPET%%bin/csv2yapet
3	share/applications/yapet.desktop	3	share/applications/yapet.desktop
4	%%DOCSDIR%%/AUTHORS	4	%%NOPORTDOCS%%%%DOCSDIR%%/AUTHORS
5	%%DOCSDIR%%/COPYING	5	%%NOPORTDOCS%%%%DOCSDIR%%/COPYING
6	%%DOCSDIR%%/DESIGN	6	%%NOPORTDOCS%%%%DOCSDIR%%/DESIGN
7	%%DOCSDIR%%/README	7	%%NOPORTDOCS%%%%DOCSDIR%%/README
8	%%DOCSDIR%%/LICENSE	8	%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
9	%%DOCSDIR%%/html/DESIGN.html	9	%%NOPORTDOCS%%%%DOCSDIR%%/html/DESIGN.html
10	%%DOCSDIR%%/html/README.html	10	%%NOPORTDOCS%%%%DOCSDIR%%/html/README.html
11	%%DOCSDIR%%/html/yapet.html	11	%%NOPORTDOCS%%%%DOCSDIR%%/html/yapet.html
12	%%CSV2YAPET%%%%DOCSDIR%%/html/csv2yapet.html	12	%%NOPORTDOCS%%%%CSV2YAPET%%%%DOCSDIR%%/html/csv2yapet.html
13	%%NLS%%share/locale/de_AT/LC_MESSAGES/yapet.mo	13	%%NLS%%share/locale/de_AT/LC_MESSAGES/yapet.mo
14	%%NLS%%share/locale/de_CH/LC_MESSAGES/yapet.mo	14	%%NLS%%share/locale/de_CH/LC_MESSAGES/yapet.mo
15	%%NLS%%share/locale/de_DE/LC_MESSAGES/yapet.mo	15	%%NLS%%share/locale/de_DE/LC_MESSAGES/yapet.mo
Lines 17-22 Link Here
17	@dirrmtry share/locale/de_DE	17	@dirrmtry share/locale/de_DE
18	@dirrmtry share/locale/de_CH/LC_MESSAGES	18	@dirrmtry share/locale/de_CH/LC_MESSAGES
19	@dirrmtry share/locale/de_CH	19	@dirrmtry share/locale/de_CH
20	@dirrm %%DOCSDIR%%/html	20	%%NOPORTDOCS%%@dirrm %%DOCSDIR%%/html
21	@dirrm %%DOCSDIR%%	21	%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
22	@dirrmtry share/applications	22	@dirrmtry share/applications