New version needs autotools to build. The documentation is no longer
available in html, but must be generated via doxygen, so doxygen comes
in as a build dependency.
I don't know if I have done the autoconf/automake stuff right, worked
here on amd64. Somewhat related: Could someone tell me how to include
the patches directory in the cvs diff output if there is no such
directory present on the cvs server?
Kind regards,
Markus
diff -Nu -p -r /usr/ports/www/cgicc/Makefile ./Makefile
--- /usr/ports/www/cgicc/Makefile Sun Jan 6 16:43:32 2008
+++ ./Makefile Sun Mar 15 10:33:41 2009
@@ -2,8 +2,7 @@
COMMENT= c++ compliant CGI applications libraries
-DISTNAME= cgicc-3.2.1
-PKGNAME= ${DISTNAME}p2
+DISTNAME= cgicc-3.2.4
CATEGORIES= www devel
SHARED_LIBS= cgicc 5.0
MODGNU_SHARED_LIBS=cgicc ''
@@ -18,11 +17,21 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_LIBTOOL= Yes
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ :doxygen-*:devel/doxygen
+AUTOCONF_VERSION= 2.59
+AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/example ${WRKSRC}/support
-FAKE_FLAGS= docdir=${DESTDIR}${PREFIX}/share/doc/cgicc
+WRKDIST= ${WRKDIR}/${DISTNAME}
+
+pre-configure:
+ cd ${WRKDIST} && \
+ env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} sh autogen
.include <bsd.port.mk>
diff -Nu -p -r /usr/ports/www/cgicc/distinfo ./distinfo
--- /usr/ports/www/cgicc/distinfo Thu Apr 5 19:26:20 2007
+++ ./distinfo Sat Mar 14 13:46:05 2009
@@ -1,5 +1,5 @@
-MD5 (cgicc-3.2.1.tar.gz) = Ld01l3WXaqauSmWHPhhN+Q==
-RMD160 (cgicc-3.2.1.tar.gz) = 6dPjUL3cHIDuLMWoXD1n2rC3CuU=
-SHA1 (cgicc-3.2.1.tar.gz) = zTfOmi4sKTw7lLBSAwASiA+00r4=
-SHA256 (cgicc-3.2.1.tar.gz) = HzAgvPGmAIySKW5cyNafy7Nwl8xMJmbw30+7C2rs65c=
-SIZE (cgicc-3.2.1.tar.gz) = 567850
+MD5 (cgicc-3.2.4.tar.gz) = DSyOIJcrOApXtg20pmM9nQ==
+RMD160 (cgicc-3.2.4.tar.gz) = 6QwwufQNcp1JP7ws6iSCksxWzUk=
+SHA1 (cgicc-3.2.4.tar.gz) = UG1nSjfim07n76rxd43b0oTM/zI=
+SHA256 (cgicc-3.2.4.tar.gz) = VrnE/+vRNBVsGs0ksha7QlCskjC9/hy4cayaNC3fEm4=
+SIZE (cgicc-3.2.4.tar.gz) = 1323876
diff -Nu -p -r /usr/ports/www/cgicc/patches/patch-doc_Makefile_am
./patches/patch-doc_Makefile_am
--- /usr/ports/www/cgicc/patches/patch-doc_Makefile_am Thu Jan 1 01:00:00 1970
+++ ./patches/patch-doc_Makefile_am Sun Mar 15 10:34:44 2009
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.am.orig Sun Jul 15 16:13:10 2007
++++ doc/Makefile.am Sun Mar 15 10:34:36 2009
+@@ -2,7 +2,7 @@
+
+ CLEANFILES = *~ stamp
+
+-docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(prefix)/share/doc/$(PACKAGE)
+
+ FILES = index.tmpl license.tmpl lists.tmpl bugs.tmpl demos.tmpl
\
+ cgi-overview.tmpl tutorial.tmpl lib-overview.tmpl COPYING COPYING.LIB \
diff -Nu -p -r /usr/ports/www/cgicc/pkg/PLIST ./pkg/PLIST
--- /usr/ports/www/cgicc/pkg/PLIST Wed Sep 15 20:49:49 2004
+++ ./pkg/PLIST Sun Mar 15 10:37:34 2009
@@ -27,6 +27,7 @@ include/cgicc/HTTPStatusHeader.h
include/cgicc/MStreamable.h
lib/libcgicc.a
lib/libcgicc.la
+%%SHARED%%
share/doc/cgicc/
share/doc/cgicc/COPYING-source.html
share/doc/cgicc/COPYING_8DOC-source.html
@@ -81,6 +82,8 @@ share/doc/cgicc/MStreamable_8h-source.html
share/doc/cgicc/MStreamable_8h.html
share/doc/cgicc/annotated.html
share/doc/cgicc/bugs_8tmpl-source.html
+share/doc/cgicc/cardgame_8cpp-source.html
+share/doc/cgicc/cardgame_8cpp.html
share/doc/cgicc/cgi-overview_8tmpl-source.html
share/doc/cgicc/cgi_overview.html
share/doc/cgicc/cgicc-doc.css
@@ -101,64 +104,105 @@ share/doc/cgicc/classcgicc_1_1FormEntry.html
share/doc/cgicc/classcgicc_1_1FormFile-members.html
share/doc/cgicc/classcgicc_1_1FormFile.html
share/doc/cgicc/classcgicc_1_1HTMLAtomicElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLAtomicElement.gif
share/doc/cgicc/classcgicc_1_1HTMLAtomicElement.html
+share/doc/cgicc/classcgicc_1_1HTMLAtomicElement.png
share/doc/cgicc/classcgicc_1_1HTMLAttribute-members.html
-share/doc/cgicc/classcgicc_1_1HTMLAttribute.gif
share/doc/cgicc/classcgicc_1_1HTMLAttribute.html
+share/doc/cgicc/classcgicc_1_1HTMLAttribute.png
share/doc/cgicc/classcgicc_1_1HTMLAttributeList-members.html
share/doc/cgicc/classcgicc_1_1HTMLAttributeList.html
share/doc/cgicc/classcgicc_1_1HTMLBooleanElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLBooleanElement.gif
share/doc/cgicc/classcgicc_1_1HTMLBooleanElement.html
+share/doc/cgicc/classcgicc_1_1HTMLBooleanElement.png
share/doc/cgicc/classcgicc_1_1HTMLDoctype-members.html
-share/doc/cgicc/classcgicc_1_1HTMLDoctype.gif
share/doc/cgicc/classcgicc_1_1HTMLDoctype.html
+share/doc/cgicc/classcgicc_1_1HTMLDoctype.png
share/doc/cgicc/classcgicc_1_1HTMLElement-members.html
-share/doc/cgicc/classcgicc_1_1HTMLElement.gif
share/doc/cgicc/classcgicc_1_1HTMLElement.html
+share/doc/cgicc/classcgicc_1_1HTMLElement.png
share/doc/cgicc/classcgicc_1_1HTMLElementList-members.html
share/doc/cgicc/classcgicc_1_1HTMLElementList.html
share/doc/cgicc/classcgicc_1_1HTTPContentHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPContentHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPContentHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPContentHeader.png
share/doc/cgicc/classcgicc_1_1HTTPCookie-members.html
-share/doc/cgicc/classcgicc_1_1HTTPCookie.gif
share/doc/cgicc/classcgicc_1_1HTTPCookie.html
+share/doc/cgicc/classcgicc_1_1HTTPCookie.png
share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPHTMLHeader.png
share/doc/cgicc/classcgicc_1_1HTTPHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPHeader.png
share/doc/cgicc/classcgicc_1_1HTTPPlainHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPPlainHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPPlainHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPPlainHeader.png
share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPRedirectHeader.png
share/doc/cgicc/classcgicc_1_1HTTPResponseHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPResponseHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPResponseHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPResponseHeader.png
share/doc/cgicc/classcgicc_1_1HTTPStatusHeader-members.html
-share/doc/cgicc/classcgicc_1_1HTTPStatusHeader.gif
share/doc/cgicc/classcgicc_1_1HTTPStatusHeader.html
+share/doc/cgicc/classcgicc_1_1HTTPStatusHeader.png
share/doc/cgicc/classcgicc_1_1MStreamable-members.html
-share/doc/cgicc/classcgicc_1_1MStreamable.gif
share/doc/cgicc/classcgicc_1_1MStreamable.html
+share/doc/cgicc/classcgicc_1_1MStreamable.png
share/doc/cgicc/classcgicc_1_1comment-members.html
-share/doc/cgicc/classcgicc_1_1comment.gif
share/doc/cgicc/classcgicc_1_1comment.html
+share/doc/cgicc/classcgicc_1_1comment.png
share/doc/cgicc/config_8h-source.html
share/doc/cgicc/cookie_8cpp-source.html
share/doc/cgicc/cookie_8cpp.html
share/doc/cgicc/demos_8tmpl-source.html
share/doc/cgicc/dns_8cpp-source.html
share/doc/cgicc/dns_8cpp.html
-share/doc/cgicc/doxygen.gif
+share/doc/cgicc/doxygen.css
+share/doc/cgicc/doxygen.png
share/doc/cgicc/files.html
share/doc/cgicc/functions.html
+share/doc/cgicc/functions_0x63.html
+share/doc/cgicc/functions_0x64.html
+share/doc/cgicc/functions_0x65.html
+share/doc/cgicc/functions_0x66.html
+share/doc/cgicc/functions_0x67.html
+share/doc/cgicc/functions_0x68.html
+share/doc/cgicc/functions_0x69.html
+share/doc/cgicc/functions_0x6c.html
+share/doc/cgicc/functions_0x6d.html
+share/doc/cgicc/functions_0x6f.html
+share/doc/cgicc/functions_0x70.html
+share/doc/cgicc/functions_0x71.html
+share/doc/cgicc/functions_0x72.html
+share/doc/cgicc/functions_0x73.html
+share/doc/cgicc/functions_0x75.html
+share/doc/cgicc/functions_0x77.html
+share/doc/cgicc/functions_0x7e.html
+share/doc/cgicc/functions_enum.html
+share/doc/cgicc/functions_eval.html
+share/doc/cgicc/functions_func.html
+share/doc/cgicc/functions_func_0x63.html
+share/doc/cgicc/functions_func_0x64.html
+share/doc/cgicc/functions_func_0x66.html
+share/doc/cgicc/functions_func_0x67.html
+share/doc/cgicc/functions_func_0x68.html
+share/doc/cgicc/functions_func_0x69.html
+share/doc/cgicc/functions_func_0x6c.html
+share/doc/cgicc/functions_func_0x6d.html
+share/doc/cgicc/functions_func_0x6f.html
+share/doc/cgicc/functions_func_0x71.html
+share/doc/cgicc/functions_func_0x72.html
+share/doc/cgicc/functions_func_0x73.html
+share/doc/cgicc/functions_func_0x75.html
+share/doc/cgicc/functions_func_0x77.html
+share/doc/cgicc/functions_func_0x7e.html
+share/doc/cgicc/functions_rela.html
+share/doc/cgicc/functions_vars.html
share/doc/cgicc/globals.html
+share/doc/cgicc/globals_defs.html
+share/doc/cgicc/globals_func.html
+share/doc/cgicc/gnu-head-sm.jpg
share/doc/cgicc/hierarchy.html
share/doc/cgicc/index.html
share/doc/cgicc/index_8tmpl-source.html
@@ -169,13 +213,23 @@ share/doc/cgicc/license_fdl.html
share/doc/cgicc/license_gpl.html
share/doc/cgicc/license_lgpl.html
share/doc/cgicc/lists_8tmpl-source.html
+share/doc/cgicc/namespaceCardGameTools.html
share/doc/cgicc/namespacecgicc.html
share/doc/cgicc/namespacemembers.html
+share/doc/cgicc/namespacemembers_func.html
+share/doc/cgicc/namespacemembers_type.html
share/doc/cgicc/namespaces.html
share/doc/cgicc/pages.html
+share/doc/cgicc/structdatasgame-members.html
+share/doc/cgicc/structdatasgame.html
+share/doc/cgicc/structdatasplayer-members.html
+share/doc/cgicc/structdatasplayer.html
+share/doc/cgicc/tab_b.gif
+share/doc/cgicc/tab_l.gif
+share/doc/cgicc/tab_r.gif
+share/doc/cgicc/tabs.css
share/doc/cgicc/test_8cpp-source.html
share/doc/cgicc/test_8cpp.html
share/doc/cgicc/tutorial_8tmpl-source.html
share/doc/cgicc/upload_8cpp-source.html
share/doc/cgicc/upload_8cpp.html
-%%SHARED%%
