diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 583bc9fe3d6..b1362e8949f 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2011/04/15 09:44:06 pea Exp $ +# $OpenBSD: Makefile,v 1.32 2011/04/17 17:56:02 jasper Exp $ SHARED_ONLY= Yes SHARED_LIBS += freeradius-radius 4.0 # .0.0 @@ -20,7 +20,7 @@ PKGNAME-mysql= freeradius-mysql-$V PKGNAME-pgsql= freeradius-pgsql-$V PKGNAME-ldap= freeradius-ldap-$V -REVISION= 0 +REVISION-main= 1 CATEGORIES= net security diff --git a/net/freeradius/patches/patch-src_main_session_c b/net/freeradius/patches/patch-src_main_session_c deleted file mode 100644 index f73a4004320..00000000000 --- a/net/freeradius/patches/patch-src_main_session_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_main_session_c,v 1.5 2008/07/28 21:51:10 rui Exp $ ---- src/main/session.c.orig Thu Jun 5 11:18:53 2008 -+++ src/main/session.c Tue Jul 15 08:43:37 2008 -@@ -204,7 +204,7 @@ int rad_check_ts(uint32_t nasaddr, unsigned int portnu - processor to execute checkrad - */ - execl(getenv("COMSPEC"), "", "/C","checkrad", cl->nastype, address, port, -- user, session_id, NULL); -+ user, session_id, (void *)NULL); - #else - execl(mainconfig.checkrad, "checkrad", cl->nastype, address, port, - user, session_id, NULL); diff --git a/net/nssl/Makefile b/net/nssl/Makefile index 270163f71aa..78b298bf2e8 100644 --- a/net/nssl/Makefile +++ b/net/nssl/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2010/07/12 22:07:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2011/04/17 17:56:02 jasper Exp $ COMMENT= netcat-like program with transparent SSL support DISTNAME= nssl.005 PKGNAME= nssl-005 -REVISION= 0 +REVISION= 1 CATEGORIES= net HOMEPAGE= http://nssl.sourceforge.net/ @@ -27,7 +27,7 @@ NO_REGRESS= Yes WRKDIST= ${WRKDIR}/nssl do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/nssl ${PREFIX}/bin/nssl + ${INSTALL_PROGRAM} ${WRKBUILD}/nssl ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nssl/ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/nssl/ diff --git a/net/nssl/patches/patch-utils_c b/net/nssl/patches/patch-utils_c deleted file mode 100644 index ee5723ef7da..00000000000 --- a/net/nssl/patches/patch-utils_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-utils_c,v 1.1.1.1 2006/11/06 05:24:55 jolan Exp $ ---- utils.c.orig Tue Oct 23 12:00:41 2001 -+++ utils.c Sun Nov 5 23:13:54 2006 -@@ -102,7 +102,7 @@ struct fdpipe *x_popen (char *command) - - setsid (); - -- if ( execl (command, command, NULL) == -1 ) -+ if ( execl (command, command, (void *)NULL) == -1 ) - { - perror ("exec"); - exit (1);