Jeremie Courreges-Anglas <j...@wxcvbn.org> writes:

> Hi,
>
> Davide Gerhard <rain...@irh.it> writes:
>
>> =- To ports@openbsd.org wrote on Sat  8.Oct'16 at 11:54:48 +0200 -=
>>
>>> Hello ports@,
>>> 
>>> This update devel/libconfuse to 3.0
>>> Tested on amd64.
>>> 
>>> It also update HOMEPAGE and MASTER_SITES because
>>> the project moves to github.
>>
>> thanks to Rafael Sadowski, I update the patch.
>>
>> changes:
>> - use V to bump version quickly 
>> - homepage with https
>> - removed REVISION
>>
>> I don't use GH_* because otherwise it needs autoconf and,
>> I think, this should be avoided. Wrong?
>
> If a project makes proper releases then yeah, let's use proper releases.
>
> One issue with the diff as is:
> -SHARED_LIBS=         confuse 1.0     # .0.0
> +SHARED_LIBS=         confuse 1.0
>
> caught my eye.  When upgrading a library, one should verify that no
> changes are due wrt the library version.  See
> http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs for more
> information.  Here, several functions have been added (that would warrant
> a minor bump) and at least struct cfg_opt_t has evolved in an
> incompatible way -> major bump. Please bump the library version to 2.0,
> and keep a note, after the comment you removed, that upstream is now at
> 1.0.
>
> Also, libconfuse is not only used by x11/tilda, did you test the other
> consumers?

Meanwhile, I looked at the layout of the documentation, and I think we
can do better.  Upstream now installs stuff in share/doc/confuse, so it
looks weird that we keep on installing stuff in share/doc/libconfuse.
Also, putting the tutorial in a subdirectory of the API docs doesn't
make the former very visible.

Here's an updated diff that fixes a spacing nit, bumps the shlib
version, and moves documentation to share/doc/confuse/{manual,tutorial}.

Thoughts?


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/devel/libconfuse/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile    12 Apr 2016 15:19:40 -0000      1.13
+++ Makefile    17 Oct 2016 19:12:45 -0000
@@ -1,20 +1,20 @@
 # $OpenBSD: Makefile,v 1.13 2016/04/12 15:19:40 naddy Exp $
 
 COMMENT=               configuration file parser library
-DISTNAME=              confuse-2.7
+V=                     3.0
+DISTNAME=              confuse-${V}
 PKGNAME=               lib${DISTNAME}
-REVISION=              3
-SHARED_LIBS=           confuse 1.0     # .0.0
+SHARED_LIBS=           confuse 2.0     # 1.0
 CATEGORIES=            devel
 
-HOMEPAGE=              http://www.nongnu.org/confuse/
+HOMEPAGE=              https://github.com/martinh/libconfuse
 
 # ISC
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB=               iconv intl
 
-MASTER_SITES=          ${MASTER_SITE_SAVANNAH:=confuse/}
+MASTER_SITES=          
https://github.com/martinh/libconfuse/releases/download/v${V}/
 
 LIB_DEPENDS=           devel/gettext
 
@@ -22,11 +22,14 @@ CONFIGURE_STYLE=    gnu
 CONFIGURE_ENV+=                LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ENV+=                CPPFLAGS="-I${LOCALBASE}/include"
 
-
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libconfuse/tutorial/
-       ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/libconfuse
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/confuse/manual/search
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/search/* \
+               ${PREFIX}/share/doc/confuse/manual/search
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/{*html,*png,*css,*js} \
+               ${PREFIX}/share/doc/confuse/manual/
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/confuse/tutorial
        ${INSTALL_DATA} ${WRKSRC}/doc/tutorial-html/* \
-               ${PREFIX}/share/doc/libconfuse/tutorial
+               ${PREFIX}/share/doc/confuse/tutorial
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/devel/libconfuse/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    18 Jan 2015 03:13:15 -0000      1.5
+++ distinfo    17 Oct 2016 18:03:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (confuse-2.7.tar.gz) = 4yV0/YN+lQd42set5AeH3SJZ744orNbt5oR8qJXIh3g=
-SIZE (confuse-2.7.tar.gz) = 517272
+SHA256 (confuse-3.0.tar.gz) = 8fMm2UQxAwNtGcMtPz7+w6hcOwgdmVNEY2aNKZksRkg=
+SIZE (confuse-3.0.tar.gz) = 725452
Index: pkg/PLIST
===================================================================
RCS file: /d/cvs/ports/devel/libconfuse/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:41 -0000      1.4
+++ pkg/PLIST   17 Oct 2016 19:10:42 -0000
@@ -4,45 +4,143 @@ lib/libconfuse.a
 lib/libconfuse.la
 @lib lib/libconfuse.so.${LIBconfuse_VERSION}
 lib/pkgconfig/libconfuse.pc
-share/doc/libconfuse/
-share/doc/libconfuse/annotated.html
-share/doc/libconfuse/classes.html
-share/doc/libconfuse/confuse_8h-source.html
-share/doc/libconfuse/confuse_8h.html
-share/doc/libconfuse/doxygen.png
-share/doc/libconfuse/examples.html
-share/doc/libconfuse/files.html
-share/doc/libconfuse/ftpconf_8c-example.html
-share/doc/libconfuse/functions.html
-share/doc/libconfuse/functions_vars.html
-share/doc/libconfuse/globals.html
-share/doc/libconfuse/globals_defs.html
-share/doc/libconfuse/globals_enum.html
-share/doc/libconfuse/globals_eval.html
-share/doc/libconfuse/globals_func.html
-share/doc/libconfuse/globals_type.html
-share/doc/libconfuse/index.html
-share/doc/libconfuse/reread_8c-example.html
-share/doc/libconfuse/simple_8c-example.html
-share/doc/libconfuse/structcfg__defvalue__t.html
-share/doc/libconfuse/structcfg__opt__t.html
-share/doc/libconfuse/structcfg__t.html
-share/doc/libconfuse/tab_b.gif
-share/doc/libconfuse/tab_l.gif
-share/doc/libconfuse/tab_r.gif
-share/doc/libconfuse/tabs.css
-share/doc/libconfuse/tutorial/
-share/doc/libconfuse/tutorial.css
-share/doc/libconfuse/tutorial/ar01s02.html
-share/doc/libconfuse/tutorial/ar01s03.html
-share/doc/libconfuse/tutorial/ar01s04.html
-share/doc/libconfuse/tutorial/ar01s05.html
-share/doc/libconfuse/tutorial/ar01s06.html
-share/doc/libconfuse/tutorial/ar01s07.html
-share/doc/libconfuse/tutorial/ar01s08.html
-share/doc/libconfuse/tutorial/ar01s09.html
-share/doc/libconfuse/tutorial/index.html
-share/doc/libconfuse/tutorial/tutorial.css
-share/doc/libconfuse/unioncfg__value__t.html
+share/doc/confuse/
+share/doc/confuse/AUTHORS
+share/doc/confuse/ChangeLog.md
+share/doc/confuse/LICENSE
+share/doc/confuse/README.md
+share/doc/confuse/manual/
+share/doc/confuse/manual/annotated.html
+share/doc/confuse/manual/arrowdown.png
+share/doc/confuse/manual/arrowright.png
+share/doc/confuse/manual/bc_s.png
+share/doc/confuse/manual/bdwn.png
+share/doc/confuse/manual/classes.html
+share/doc/confuse/manual/closed.png
+share/doc/confuse/manual/confuse_8h.html
+share/doc/confuse/manual/confuse_8h_source.html
+share/doc/confuse/manual/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/confuse/manual/doc.png
+share/doc/confuse/manual/doxygen.css
+share/doc/confuse/manual/doxygen.png
+share/doc/confuse/manual/dynsections.js
+share/doc/confuse/manual/examples.html
+share/doc/confuse/manual/files.html
+share/doc/confuse/manual/folderclosed.png
+share/doc/confuse/manual/folderopen.png
+share/doc/confuse/manual/ftpconf_8c-example.html
+share/doc/confuse/manual/functions.html
+share/doc/confuse/manual/functions_vars.html
+share/doc/confuse/manual/globals.html
+share/doc/confuse/manual/globals_defs.html
+share/doc/confuse/manual/globals_enum.html
+share/doc/confuse/manual/globals_eval.html
+share/doc/confuse/manual/globals_func.html
+share/doc/confuse/manual/globals_type.html
+share/doc/confuse/manual/index.html
+share/doc/confuse/manual/jquery.js
+share/doc/confuse/manual/nav_f.png
+share/doc/confuse/manual/nav_g.png
+share/doc/confuse/manual/nav_h.png
+share/doc/confuse/manual/open.png
+share/doc/confuse/manual/reread_8c-example.html
+share/doc/confuse/manual/search/
+share/doc/confuse/manual/search/all_0.html
+share/doc/confuse/manual/search/all_0.js
+share/doc/confuse/manual/search/all_1.html
+share/doc/confuse/manual/search/all_1.js
+share/doc/confuse/manual/search/all_2.html
+share/doc/confuse/manual/search/all_2.js
+share/doc/confuse/manual/search/all_3.html
+share/doc/confuse/manual/search/all_3.js
+share/doc/confuse/manual/search/all_4.html
+share/doc/confuse/manual/search/all_4.js
+share/doc/confuse/manual/search/all_5.html
+share/doc/confuse/manual/search/all_5.js
+share/doc/confuse/manual/search/all_6.html
+share/doc/confuse/manual/search/all_6.js
+share/doc/confuse/manual/search/all_7.html
+share/doc/confuse/manual/search/all_7.js
+share/doc/confuse/manual/search/all_8.html
+share/doc/confuse/manual/search/all_8.js
+share/doc/confuse/manual/search/all_9.html
+share/doc/confuse/manual/search/all_9.js
+share/doc/confuse/manual/search/all_a.html
+share/doc/confuse/manual/search/all_a.js
+share/doc/confuse/manual/search/all_b.html
+share/doc/confuse/manual/search/all_b.js
+share/doc/confuse/manual/search/classes_0.html
+share/doc/confuse/manual/search/classes_0.js
+share/doc/confuse/manual/search/close.png
+share/doc/confuse/manual/search/defines_0.html
+share/doc/confuse/manual/search/defines_0.js
+share/doc/confuse/manual/search/enums_0.html
+share/doc/confuse/manual/search/enums_0.js
+share/doc/confuse/manual/search/enumvalues_0.html
+share/doc/confuse/manual/search/enumvalues_0.js
+share/doc/confuse/manual/search/files_0.html
+share/doc/confuse/manual/search/files_0.js
+share/doc/confuse/manual/search/functions_0.html
+share/doc/confuse/manual/search/functions_0.js
+share/doc/confuse/manual/search/mag_sel.png
+share/doc/confuse/manual/search/nomatches.html
+share/doc/confuse/manual/search/pages_0.html
+share/doc/confuse/manual/search/pages_0.js
+share/doc/confuse/manual/search/search.css
+share/doc/confuse/manual/search/search.js
+share/doc/confuse/manual/search/search_l.png
+share/doc/confuse/manual/search/search_m.png
+share/doc/confuse/manual/search/search_r.png
+share/doc/confuse/manual/search/searchdata.js
+share/doc/confuse/manual/search/typedefs_0.html
+share/doc/confuse/manual/search/typedefs_0.js
+share/doc/confuse/manual/search/variables_0.html
+share/doc/confuse/manual/search/variables_0.js
+share/doc/confuse/manual/search/variables_1.html
+share/doc/confuse/manual/search/variables_1.js
+share/doc/confuse/manual/search/variables_2.html
+share/doc/confuse/manual/search/variables_2.js
+share/doc/confuse/manual/search/variables_3.html
+share/doc/confuse/manual/search/variables_3.js
+share/doc/confuse/manual/search/variables_4.html
+share/doc/confuse/manual/search/variables_4.js
+share/doc/confuse/manual/search/variables_5.html
+share/doc/confuse/manual/search/variables_5.js
+share/doc/confuse/manual/search/variables_6.html
+share/doc/confuse/manual/search/variables_6.js
+share/doc/confuse/manual/search/variables_7.html
+share/doc/confuse/manual/search/variables_7.js
+share/doc/confuse/manual/search/variables_8.html
+share/doc/confuse/manual/search/variables_8.js
+share/doc/confuse/manual/search/variables_9.html
+share/doc/confuse/manual/search/variables_9.js
+share/doc/confuse/manual/search/variables_a.html
+share/doc/confuse/manual/search/variables_a.js
+share/doc/confuse/manual/simple_8c-example.html
+share/doc/confuse/manual/splitbar.png
+share/doc/confuse/manual/structcfg__defvalue__t.html
+share/doc/confuse/manual/structcfg__opt__t.html
+share/doc/confuse/manual/structcfg__t.html
+share/doc/confuse/manual/sync_off.png
+share/doc/confuse/manual/sync_on.png
+share/doc/confuse/manual/tab_a.png
+share/doc/confuse/manual/tab_b.png
+share/doc/confuse/manual/tab_h.png
+share/doc/confuse/manual/tab_s.png
+share/doc/confuse/manual/tabs.css
+share/doc/confuse/manual/unioncfg__simple__t.html
+share/doc/confuse/manual/unioncfg__value__t.html
+share/doc/confuse/tutorial/
+share/doc/confuse/tutorial/ar01s02.html
+share/doc/confuse/tutorial/ar01s03.html
+share/doc/confuse/tutorial/ar01s04.html
+share/doc/confuse/tutorial/ar01s05.html
+share/doc/confuse/tutorial/ar01s06.html
+share/doc/confuse/tutorial/ar01s07.html
+share/doc/confuse/tutorial/ar01s08.html
+share/doc/confuse/tutorial/ar01s09.html
+share/doc/confuse/tutorial/index.html
+share/doc/confuse/tutorial/tutorial.css
+share/locale/de/LC_MESSAGES/confuse.mo
 share/locale/fr/LC_MESSAGES/confuse.mo
 share/locale/sv/LC_MESSAGES/confuse.mo


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to