Bug 133634 - [MAINTAINER-UPDATE] sysutils/bacula-docs upgrade to latest version
Summary: [MAINTAINER-UPDATE] sysutils/bacula-docs upgrade to latest version
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-04-12 04:30 UTC by Dan Langille
Modified: 2009-05-07 01:30 UTC (History)
1 user (show)

See Also:

Attachments
bacula-docs.diff (3.29 KB, patch)
2009-04-12 04:30 UTC, Dan Langille 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dan Langille 2009-04-12 04:30:02 UTC 
The new docs are quite different than the old docs.
Instead of one massive document, we now have seven 
distinct manuals.
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2009-04-12 05:04:37 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 2 Dmitry Marakasov 2009-04-12 05:13:54 UTC 
> Synopsis: [MAINTAINER-UPDATE] sysutils/bacula-docs upgrade to latest version
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=133634

What about this instead:

- Use PORTDOCS=* to not list docfiles twice
- Use INSTALL_DATA instead of CP
- Find docs automatically (this is questionable, may as leave separate
  INSTALL_DATA for each file
- While here, fix some identation and use SF macro

--- bacula-docs.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/sysutils/bacula-docs/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	6 Jan 2009 15:32:47 -0000	1.15
+++ Makefile	12 Apr 2009 04:09:50 -0000
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	bacula
-PORTVERSION=	2.4.4
+PORTVERSION=	3.0.0
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	bacula
+MASTER_SITES=	SF
 PKGNAMESUFFIX=	-docs
 DISTFILES=	${PORTNAME}-docs-${PORTVERSION}.tar.bz2 ${PORTNAME}-${PORTVERSION}.tar.gz
 
@@ -20,23 +19,22 @@
 
 CONFLICTS=	bacula-server-devel[0-9]* bacula-client-devel[0-9]* bacula-docs-devel-[0-9]*
 
-UNIQUENAME=${PORTNAME}${PKGNAMESUFFIX}
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-PORTDOCS=	ReleaseNotes bacula.pdf kernstodo manual
+PORTDOCS=	*
 
 .ifdef NOPORTDOCS
-IGNORE=	consists of only documentation, please undef NOPORTDOCS and try again
+IGNORE=		consists of only documentation, please undef NOPORTDOCS and try again
 .endif
 
 do-install:
-# Documentation is only installed in -client port
-	for na in manual; do \
-		${MKDIR} ${DOCSDIR}/$$na ;\
-		cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \
-			${CPIO} -pdm -L -R root:wheel ${DOCSDIR}; \
-	done
-	@${CP} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes ${DOCSDIR}
-	@${CP} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manual/bacula.pdf ${DOCSDIR}
-	@${CP} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes \
+		${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo \
+		${DOCSDIR}/
+
+	${FIND} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manuals/en \
+		-name "*.pdf" -exec ${INSTALL_DATA} {} ${DOCSDIR}/ \;
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/sysutils/bacula-docs/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	6 Jan 2009 15:32:47 -0000	1.15
+++ distinfo	12 Apr 2009 04:04:41 -0000
@@ -1,6 +1,6 @@
-MD5 (bacula-docs-2.4.4.tar.bz2) = d9bb3e8ca8c9a4c741b83569c21a4806
-SHA256 (bacula-docs-2.4.4.tar.bz2) = 4ee4569ebac5666a6293f6353dd2e188d6c3dc890f41c8c5a97d55706416864b
-SIZE (bacula-docs-2.4.4.tar.bz2) = 23009484
-MD5 (bacula-2.4.4.tar.gz) = 4eb6155b45611018af03002d37a2ffde
-SHA256 (bacula-2.4.4.tar.gz) = 3a698bdf0fd3f55733a6a4aabe8c3dc2b1ed1ad5ca7fab000f6e0f804a9d3d38
-SIZE (bacula-2.4.4.tar.gz) = 3145564
+MD5 (bacula-docs-3.0.0.tar.bz2) = 2c3a1c6ba46b1371240a9b8d053fdf61
+SHA256 (bacula-docs-3.0.0.tar.bz2) = 7fc4d944f7e8222bfddba4b342ca19f7783e89e5439daa059cb45f783049e996
+SIZE (bacula-docs-3.0.0.tar.bz2) = 40703755
+MD5 (bacula-3.0.0.tar.gz) = 5ea5294c4f66f0d8ba1414f1ca9dc79b
+SHA256 (bacula-3.0.0.tar.gz) = cafcf9e9682662d2efcef84a6d90ee09230c60c7ed15a7051b70a30f2966d45c
+SIZE (bacula-3.0.0.tar.gz) = 3834280
--- bacula-docs.patch ends here ---

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 3 Dan Langille 2009-04-12 23:46:04 UTC 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dmitry: Thank you.  Good suggestions.

Please proceed.  :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknibywACgkQCgsXFM/7nTywcACglfN3Iah9epoIBdrIOZaY/8eA
r8oAn2zZrju+IXjaDNqRzLA03AbFXZ8e
=oeSy
-----END PGP SIGNATURE-----
Comment 4 Dmitry Marakasov freebsd_committer freebsd_triage 2009-05-07 01:30:17 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!