diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 44b8a79be83a..06372fa01b8c 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -1,37 +1,37 @@ PORTNAME= rudiments -PORTVERSION= 1.2.2 +PORTVERSION= 1.4.2 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= pi@FreeBSD.org COMMENT= C++ class library for daemons, clients, servers, and more WWW= http://rudiments.sourceforge.net LICENSE= LGPL20 -LIB_DEPENDS= libgssapi_krb5.so:security/krb5 \ - libcurl.so:ftp/curl +LIB_DEPENDS= libcurl.so:ftp/curl \ + libgssapi_krb5.so:security/krb5 -USES= libtool libedit pathfix pkgconfig readline shebangfix +USES= libedit libtool pathfix pkgconfig readline shebangfix GNU_CONFIGURE= yes PATHFIX_MAKEFILEIN= Makefile SHEBANG_FILES= doc/programming/insert.pl USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" PORTDOCS= * OPTIONS_DEFINE= DOCS PCRE SSL OPTIONS_DEFAULT= SSL PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_ENABLE= pcre SSL_USES= ssl SSL_CONFIGURE_ENABLE= ssl SSL_CONFIGURE_ON= --with-ssl-includes=-I${OPENSSLINC} \ --with-ssl-libs=-L${OPENSSLLIB} post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.6.0.1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.8.1.1 .include diff --git a/devel/rudiments/distinfo b/devel/rudiments/distinfo index 21e598149826..dfe503d7a030 100644 --- a/devel/rudiments/distinfo +++ b/devel/rudiments/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592141146 -SHA256 (rudiments-1.2.2.tar.gz) = ad2dbf7cb2a5cbaca38073fef55ead89f40887d21524cab620379c7c2c1f1138 -SIZE (rudiments-1.2.2.tar.gz) = 2400561 +TIMESTAMP = 1678644423 +SHA256 (rudiments-1.4.2.tar.gz) = e30220a4c5ae0ad66441a3df34d5468658f116f4dcf37b0abcadae81873ebd90 +SIZE (rudiments-1.4.2.tar.gz) = 2950740 diff --git a/devel/rudiments/files/patch-Makefile b/devel/rudiments/files/patch-Makefile index 29716d1a4e87..a77f4a90e8f7 100644 --- a/devel/rudiments/files/patch-Makefile +++ b/devel/rudiments/files/patch-Makefile @@ -1,20 +1,20 @@ ---- Makefile.orig 2017-01-19 06:26:09 UTC +--- Makefile.orig 2023-03-12 18:29:53 UTC +++ Makefile -@@ -17,9 +17,6 @@ install: +@@ -18,9 +18,6 @@ install: cd bin $(AND) $(MAKE) install cd doc $(AND) $(MAKE) install cd man $(AND) $(MAKE) install - $(MKINSTALLDIRS) $(licensedir) - $(CP) COPYING $(licensedir) - $(CHMOD) 0644 $(licensedir)/COPYING $(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig $(CP) rudiments.pc $(prefix)/libdata/pkgconfig $(CHMOD) 644 $(prefix)/libdata/pkgconfig/rudiments.pc -@@ -31,7 +28,6 @@ uninstall: +@@ -32,7 +29,6 @@ uninstall: cd doc $(AND) $(MAKE) uninstall cd man $(AND) $(MAKE) uninstall $(RM) $(prefix)/libdata/pkgconfig/rudiments.pc - $(RMTREE) $(licensedir) distclean: clean - $(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/rudiments.opensdf msvc/rudiments.sdf msvc/rudiments.suo + $(RM) config.mk config.cache config.h config.log config.status features.mk libtool rudiments.pc include/Makefile include/rudiments/private/config.h include/rudiments/private/config.h.in~ bin/rudiments-config src/Makefile msvc/setupx86/rudiments.opensdf msvc/setupx86/rudiments.sdf msvc/setupx86/rudiments.suo msvc/setupx86/setupx86.vdproj msvc/setupx64/rudiments.opensdf msvc/setupx64/rudiments.sdf msvc/setupx64/rudiments.suo msvc/setupx64/setupx64.vdproj configure.lineno test/certificates/config/ca.cnf test/testresults.log diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure index 80263ec3a7b9..716976852ef1 100644 --- a/devel/rudiments/files/patch-configure +++ b/devel/rudiments/files/patch-configure @@ -1,30 +1,30 @@ ---- configure.orig 2017-03-26 09:14:47.000000000 +0000 -+++ configure 2017-03-26 09:14:47.000000000 +0000 -@@ -9622,7 +9622,7 @@ +--- configure.orig 2021-11-04 04:43:06 UTC ++++ configure +@@ -9821,7 +9821,7 @@ $as_echo_n "checking whether the $compiler linker ($LD hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no - link_all_deplibs=unknown + link_all_deplibs=no module_cmds= module_expsym_cmds= old_archive_from_new_cmds= -@@ -12871,7 +12871,7 @@ +@@ -13070,7 +13070,7 @@ module_expsym_cmds_CXX= inherit_rpath_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown +link_all_deplibs_CXX=no old_archive_cmds_CXX=$old_archive_cmds reload_flag_CXX=$reload_flag reload_cmds_CXX=$reload_cmds -@@ -16512,6 +16512,9 @@ +@@ -16722,6 +16722,9 @@ export LD_LIBRARY_PATH WERROR="" ;; *mingw32* ) + WERROR="" + ;; + freebsd* ) WERROR="" ;; *) diff --git a/devel/rudiments/files/patch-src_Makefile.in b/devel/rudiments/files/patch-src_Makefile.in index 5336ace9cefd..c52535499c7e 100644 --- a/devel/rudiments/files/patch-src_Makefile.in +++ b/devel/rudiments/files/patch-src_Makefile.in @@ -1,20 +1,20 @@ ---- src/Makefile.in.orig 2016-12-18 06:50:16 UTC +--- src/Makefile.in.orig 2021-11-04 04:41:34 UTC +++ src/Makefile.in -@@ -11,7 +11,7 @@ LOBJS = @LOBJS@ +@@ -14,7 +14,7 @@ APACHELOBJS = @APACHELOBJS@ .SUFFIXES: .lo .cpp.lo: - $(LTCOMPILE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $< $(OUT)$@ + $(LTCOMPILE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $< $(OUT) $@ .cpp.obj: $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(COMPILE) $< -@@ -22,7 +22,7 @@ clean: +@@ -27,7 +27,7 @@ librudiments.$(LIBEXT): $(SRCS) $(LOBJS) $(LTCLEAN) $(RM) *.lo *.o *.obj *.$(LIBEXT) *.lib *.exp *.idb *.pdb *.manifest *.ii librudiments.$(LIBEXT): $(SRCS) $(LOBJS) - $(LTLINK) $(LINK) $(OUT)$@ $(LOBJS) $(LDFLAGS) $(LIBS) $(LINKFLAGS) + $(LTLINK) $(LINK) $(OUT) $@ $(LOBJS) $(LDFLAGS) $(LIBS) $(LINKFLAGS) - install: $(INSTALLLIB) - + librudiments-apache.$(LIBEXT): $(APACHESRCS) $(APACHELOBJS) + $(LTLINK) $(LINK) $(OUT)$@ $(APACHELOBJS) $(LDFLAGS) $(RUDIMENTSLIB) $(LIBS) $(APACHELIBS) $(LINKFLAGS) diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist index 793c10334421..9c0dc53c12a7 100644 --- a/devel/rudiments/pkg-plist +++ b/devel/rudiments/pkg-plist @@ -1,270 +1,338 @@ +@dir /var/run/rudiments bin/rudiments-config +include/rudiments/aes128.h include/rudiments/avltree.h include/rudiments/bytebuffer.h include/rudiments/bytestring.h +include/rudiments/cgihttpserverapi.h include/rudiments/character.h include/rudiments/charstring.h include/rudiments/chat.h include/rudiments/client.h include/rudiments/codetree.h include/rudiments/commandline.h include/rudiments/compiler.h +include/rudiments/cronschedule.h include/rudiments/crypt.h include/rudiments/csvdom.h include/rudiments/csvsax.h include/rudiments/cursordomnode.h include/rudiments/datetime.h include/rudiments/debugprint.h include/rudiments/device.h include/rudiments/dictionary.h include/rudiments/directory.h include/rudiments/dom.h include/rudiments/domevents.h include/rudiments/domnode.h include/rudiments/dynamicarray.h include/rudiments/dynamiclib.h +include/rudiments/encryption.h include/rudiments/environment.h include/rudiments/error.h include/rudiments/file.h include/rudiments/filedescriptor.h include/rudiments/filesystem.h include/rudiments/groupentry.h include/rudiments/gss.h include/rudiments/hash.h include/rudiments/hostentry.h +include/rudiments/httpbasicsecurity.h +include/rudiments/httprequest.h +include/rudiments/httpresponse.h +include/rudiments/httpserverapi.h +include/rudiments/httpserverapimain.h include/rudiments/inetsocketclient.h include/rudiments/inetsocketserver.h include/rudiments/inetsocketutil.h +include/rudiments/inidom.h +include/rudiments/inisax.h include/rudiments/input.h include/rudiments/jsondom.h include/rudiments/jsonsax.h include/rudiments/linkedlist.h include/rudiments/listener.h include/rudiments/logger.h include/rudiments/md5.h include/rudiments/memorymap.h include/rudiments/memorypool.h +include/rudiments/mvccontroller.h +include/rudiments/mvcproperties.h +include/rudiments/mvcresult.h +include/rudiments/mvcsecurity.h +include/rudiments/mvcservice.h +include/rudiments/mvctier.h +include/rudiments/mvcview.h include/rudiments/output.h include/rudiments/parameterstring.h include/rudiments/permissions.h +include/rudiments/private/aes128.h +include/rudiments/private/aes128includes.h include/rudiments/private/avltree.h include/rudiments/private/avltreeincludes.h include/rudiments/private/avltreeinlines.h include/rudiments/private/avltreenode.h include/rudiments/private/bytebuffer.h include/rudiments/private/bytebufferincludes.h include/rudiments/private/bytestringincludes.h +include/rudiments/private/cgihttpserverapi.h +include/rudiments/private/cgihttpserverapiincludes.h +include/rudiments/private/cgimodule.h include/rudiments/private/characterincludes.h include/rudiments/private/charstring.h include/rudiments/private/charstringincludes.h include/rudiments/private/chat.h include/rudiments/private/chatincludes.h include/rudiments/private/client.h include/rudiments/private/clientincludes.h include/rudiments/private/codetree.h include/rudiments/private/codetreegrammar.h include/rudiments/private/codetreeincludes.h include/rudiments/private/commandline.h include/rudiments/private/commandlineincludes.h include/rudiments/private/compiler.h include/rudiments/private/compilerincludes.h include/rudiments/private/config.h +include/rudiments/private/cronschedule.h +include/rudiments/private/cronscheduleincludes.h include/rudiments/private/cryptincludes.h include/rudiments/private/csvdom.h include/rudiments/private/csvdomincludes.h include/rudiments/private/csvsax.h include/rudiments/private/csvsaxincludes.h include/rudiments/private/cursordomnode.h include/rudiments/private/cursordomnodeincludes.h include/rudiments/private/datetime.h include/rudiments/private/datetimeincludes.h include/rudiments/private/debugprint.h include/rudiments/private/device.h include/rudiments/private/deviceincludes.h include/rudiments/private/dictionary.h include/rudiments/private/dictionaryincludes.h include/rudiments/private/dictionaryinlines.h include/rudiments/private/dictionarynode.h include/rudiments/private/directory.h include/rudiments/private/directoryincludes.h include/rudiments/private/dll.h include/rudiments/private/dom.h include/rudiments/private/domevents.h include/rudiments/private/domeventsincludes.h include/rudiments/private/domincludes.h include/rudiments/private/domnode.h include/rudiments/private/domnodeincludes.h include/rudiments/private/dynamicarray.h include/rudiments/private/dynamicarrayincludes.h include/rudiments/private/dynamicarrayinlines.h include/rudiments/private/dynamiclib.h include/rudiments/private/dynamiclibincludes.h +include/rudiments/private/encryption.h +include/rudiments/private/encryptionincludes.h include/rudiments/private/environment.h include/rudiments/private/environmentincludes.h include/rudiments/private/errorincludes.h include/rudiments/private/file.h include/rudiments/private/filedescriptor.h include/rudiments/private/filedescriptorincludes.h include/rudiments/private/filedestination.h include/rudiments/private/fileincludes.h include/rudiments/private/filesystem.h include/rudiments/private/filesystemincludes.h include/rudiments/private/groupentry.h include/rudiments/private/groupentryincludes.h include/rudiments/private/gss.h include/rudiments/private/gsscontext.h include/rudiments/private/gsscredentials.h include/rudiments/private/gssincludes.h include/rudiments/private/gssmechanism.h include/rudiments/private/hashincludes.h include/rudiments/private/hostentry.h include/rudiments/private/hostentryincludes.h +include/rudiments/private/httpbasicsecurity.h +include/rudiments/private/httpbasicsecurityincludes.h +include/rudiments/private/httprequest.h +include/rudiments/private/httprequestincludes.h +include/rudiments/private/httpresponse.h +include/rudiments/private/httpresponseincludes.h +include/rudiments/private/httpserverapi.h +include/rudiments/private/httpserverapiincludes.h include/rudiments/private/inetsocketclient.h include/rudiments/private/inetsocketclientincludes.h include/rudiments/private/inetsocketserver.h include/rudiments/private/inetsocketserverincludes.h include/rudiments/private/inetsocketutil.h include/rudiments/private/inetsocketutilincludes.h +include/rudiments/private/inidom.h +include/rudiments/private/inidomincludes.h +include/rudiments/private/inisax.h +include/rudiments/private/inisaxincludes.h include/rudiments/private/inputincludes.h include/rudiments/private/inttypes.h include/rudiments/private/jsondom.h include/rudiments/private/jsondomincludes.h include/rudiments/private/jsonsax.h include/rudiments/private/jsonsaxincludes.h include/rudiments/private/linkedlist.h include/rudiments/private/linkedlistincludes.h include/rudiments/private/linkedlistinlines.h include/rudiments/private/linkedlistnode.h include/rudiments/private/listener.h include/rudiments/private/listenerincludes.h include/rudiments/private/logdestination.h include/rudiments/private/logger.h include/rudiments/private/loggerincludes.h include/rudiments/private/md5.h include/rudiments/private/md5includes.h include/rudiments/private/memorymap.h include/rudiments/private/memorymapincludes.h include/rudiments/private/memorypool.h include/rudiments/private/memorypoolincludes.h +include/rudiments/private/mvcproperties.h +include/rudiments/private/mvcpropertiesincludes.h +include/rudiments/private/mvcresult.h +include/rudiments/private/mvcresultincludes.h +include/rudiments/private/mvctier.h +include/rudiments/private/mvctierincludes.h +include/rudiments/private/mvcview.h +include/rudiments/private/mvcviewincludes.h include/rudiments/private/new.h include/rudiments/private/nodeinlines.h include/rudiments/private/outputincludes.h include/rudiments/private/parameterstring.h include/rudiments/private/parameterstringincludes.h include/rudiments/private/permissions.h include/rudiments/private/permissionsincludes.h include/rudiments/private/process.h include/rudiments/private/processincludes.h include/rudiments/private/prompt.h include/rudiments/private/promptincludes.h +include/rudiments/private/propdom.h +include/rudiments/private/propdomincludes.h +include/rudiments/private/propsax.h +include/rudiments/private/propsaxincludes.h include/rudiments/private/protocolentry.h include/rudiments/private/protocolentryincludes.h include/rudiments/private/randomnumber.h include/rudiments/private/randomnumberincludes.h include/rudiments/private/regularexpression.h include/rudiments/private/regularexpressionincludes.h include/rudiments/private/sax.h include/rudiments/private/saxincludes.h include/rudiments/private/semaphoreset.h include/rudiments/private/semaphoresetincludes.h +include/rudiments/private/sensitivevalue.h +include/rudiments/private/sensitivevalueincludes.h include/rudiments/private/server.h include/rudiments/private/serverincludes.h include/rudiments/private/serviceentry.h include/rudiments/private/serviceentryincludes.h include/rudiments/private/sha1.h include/rudiments/private/sha1includes.h include/rudiments/private/sha256.h include/rudiments/private/sha256includes.h include/rudiments/private/sharedmemory.h include/rudiments/private/sharedmemoryincludes.h include/rudiments/private/signalclassesincludes.h include/rudiments/private/signalhandler.h include/rudiments/private/signalset.h include/rudiments/private/singlylinkedlist.h include/rudiments/private/singlylinkedlistincludes.h include/rudiments/private/singlylinkedlistinlines.h include/rudiments/private/singlylinkedlistnode.h include/rudiments/private/snooze.h include/rudiments/private/snoozeincludes.h include/rudiments/private/socketclient.h include/rudiments/private/socketclientincludes.h include/rudiments/private/socketserver.h include/rudiments/private/socketserverincludes.h include/rudiments/private/staticarray.h include/rudiments/private/staticarrayinlines.h include/rudiments/private/stderrdestination.h include/rudiments/private/stdio.h include/rudiments/private/stdoutdestination.h include/rudiments/private/stringbufferincludes.h include/rudiments/private/stringbufferinlines.h include/rudiments/private/sys.h include/rudiments/private/sysincludes.h include/rudiments/private/syslogdestination.h include/rudiments/private/templateengine.h include/rudiments/private/templateengineincludes.h include/rudiments/private/thread.h include/rudiments/private/threadincludes.h include/rudiments/private/threadmutex.h include/rudiments/private/threadmutexincludes.h include/rudiments/private/tls.h include/rudiments/private/tlscertificate.h include/rudiments/private/tlscontext.h include/rudiments/private/tlsincludes.h include/rudiments/private/unixsocketclient.h include/rudiments/private/unixsocketclientincludes.h include/rudiments/private/unixsocketserver.h include/rudiments/private/unixsocketserverincludes.h include/rudiments/private/unixsocketutil.h include/rudiments/private/unixsocketutilincludes.h include/rudiments/private/url.h +include/rudiments/private/urlhttprequest.h +include/rudiments/private/urlhttprequestincludes.h include/rudiments/private/urlincludes.h include/rudiments/private/userentry.h include/rudiments/private/userentryincludes.h +include/rudiments/private/wcharacterincludes.h +include/rudiments/private/wcharstring.h +include/rudiments/private/wcharstringincludes.h include/rudiments/private/websocket.h include/rudiments/private/websocketincludes.h include/rudiments/private/winsock.h +include/rudiments/private/wstringbufferincludes.h +include/rudiments/private/wstringbufferinlines.h include/rudiments/private/xmldom.h include/rudiments/private/xmldomincludes.h include/rudiments/private/xmlsax.h include/rudiments/private/xmlsaxincludes.h include/rudiments/process.h include/rudiments/prompt.h +include/rudiments/propdom.h +include/rudiments/propsax.h include/rudiments/protocolentry.h include/rudiments/randomnumber.h include/rudiments/regularexpression.h include/rudiments/resultcodes.h include/rudiments/sax.h include/rudiments/security.h include/rudiments/semaphoreset.h +include/rudiments/sensitivevalue.h include/rudiments/server.h include/rudiments/serviceentry.h include/rudiments/sha1.h include/rudiments/sha256.h include/rudiments/sharedmemory.h include/rudiments/signalclasses.h include/rudiments/singlylinkedlist.h include/rudiments/snooze.h include/rudiments/socketclient.h include/rudiments/socketserver.h include/rudiments/staticarray.h include/rudiments/stdio.h include/rudiments/stringbuffer.h include/rudiments/sys.h include/rudiments/templateengine.h include/rudiments/thread.h include/rudiments/threadmutex.h include/rudiments/tls.h include/rudiments/unixsocketclient.h include/rudiments/unixsocketserver.h include/rudiments/unixsocketutil.h include/rudiments/url.h +include/rudiments/urlhttprequest.h include/rudiments/userentry.h +include/rudiments/wcharacter.h +include/rudiments/wcharstring.h include/rudiments/websocket.h +include/rudiments/wstringbuffer.h include/rudiments/xmldom.h include/rudiments/xmlsax.h lib/librudiments.a lib/librudiments.so -lib/librudiments.so.6 -lib/librudiments.so.6.0.1 +lib/librudiments.so.8 +lib/librudiments.so.8.1.1 libdata/pkgconfig/rudiments.pc man/man1/rudiments-config.1.gz