diff options
| -rw-r--r-- | net/mpd4/Makefile | 14 | ||||
| -rw-r--r-- | net/mpd4/distinfo | 6 | ||||
| -rw-r--r-- | net/mpd4/files/patch-gcc41 | 49 | ||||
| -rw-r--r-- | net/mpd5/Makefile | 14 | ||||
| -rw-r--r-- | net/mpd5/distinfo | 6 | ||||
| -rw-r--r-- | net/mpd5/files/patch-gcc41 | 49 |
6 files changed, 28 insertions, 110 deletions
diff --git a/net/mpd4/Makefile b/net/mpd4/Makefile index 0024aae2ee56..02a5b7326b47 100644 --- a/net/mpd4/Makefile +++ b/net/mpd4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mpd -DISTVERSION= 4.1 +DISTVERSION= 4.2 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= mpd @@ -18,11 +18,19 @@ COMMENT= Multi-link PPP daemon based on netgraph(4) LIB_DEPENDS= pdel.0:${PORTSDIR}/devel/libpdel LATEST_LINK= mpd4 + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 700041 +BUILD_DEPENDS= /usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car +RUN_DEPENDS= ${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car +.endif + MTREE_FILE= ${FILESDIR}/mpd4.mtree MAN8= mpd4.8 MANCOMPRESSED= maybe USE_RC_SUBR= mpd4.sh -HTMLNUM!= jot 62 1 +HTMLNUM!= jot 67 1 CONFSUF= conf links secret script DOCSDIR= ${TARGETDIR}/share/doc/mpd4 PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README \ @@ -32,4 +40,4 @@ PLIST_FILES= ${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4 USE_OPENSSL= yes -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/mpd4/distinfo b/net/mpd4/distinfo index febec0430fb9..693343fffed1 100644 --- a/net/mpd4/distinfo +++ b/net/mpd4/distinfo @@ -1,3 +1,3 @@ -SIZE (mpd4/mpd-4.1.tar.gz) = 407348 -MD5 (mpd4/mpd-4.1.tar.gz) = 05528ae9f64624d9cafbb9eec3bd3a73 -SHA256 (mpd4/mpd-4.1.tar.gz) = 7c9a512b4eeacb2ada7c6bdc17e0cc7d63688115d2537248e95df377322b70eb +SIZE (mpd4/mpd-4.2.tar.gz) = 436033 +MD5 (mpd4/mpd-4.2.tar.gz) = 6e14c864a047680a4e4f2087352a072f +SHA256 (mpd4/mpd-4.2.tar.gz) = 07ec96c5ca561d53df416a4b8c274b35f510d83c87c8bb8f93152667b61fd596 diff --git a/net/mpd4/files/patch-gcc41 b/net/mpd4/files/patch-gcc41 deleted file mode 100644 index 4d90395c60e6..000000000000 --- a/net/mpd4/files/patch-gcc41 +++ /dev/null @@ -1,49 +0,0 @@ ---- src/command.h.orig Sun Feb 11 23:22:25 2007 -+++ src/command.h Fri Apr 6 09:17:50 2007 -@@ -10,6 +10,8 @@ - #ifndef _COMMAND_H_ - #define _COMMAND_H_ - -+#include "vars.h" -+ - /* - * DEFINITIONS - */ -@@ -26,8 +28,6 @@ - struct optinfo options; - }; - -- extern const struct cmdtab gCommands[]; -- - struct cmdtab; - typedef const struct cmdtab *CmdTab; - struct cmdtab -@@ -38,6 +38,8 @@ - int (*admit)(CmdTab cmd); - void *arg; - }; -+ -+ extern const struct cmdtab gCommands[]; - - /* - * FUNCTIONS ---- src/ipcp.h.orig Sun Feb 11 23:22:25 2007 -+++ src/ipcp.h Fri Apr 6 09:10:32 2007 -@@ -17,6 +17,7 @@ - #include <sys/types.h> - #include <netinet/in_systm.h> - #include <netinet/ip.h> -+#include "command.h" - #include "phys.h" - #include "fsm.h" - #include "timer.h" ---- src/ipv6cp.h.orig Sun Feb 11 23:22:25 2007 -+++ src/ipv6cp.h Fri Apr 6 09:10:51 2007 -@@ -11,6 +11,7 @@ - #include <sys/types.h> - #include <netinet/in_systm.h> - #include <netinet/ip.h> -+#include "command.h" - - /* - * DEFINITONS diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 0024aae2ee56..02a5b7326b47 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mpd -DISTVERSION= 4.1 +DISTVERSION= 4.2 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= mpd @@ -18,11 +18,19 @@ COMMENT= Multi-link PPP daemon based on netgraph(4) LIB_DEPENDS= pdel.0:${PORTSDIR}/devel/libpdel LATEST_LINK= mpd4 + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 700041 +BUILD_DEPENDS= /usr/local/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car +RUN_DEPENDS= ${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car +.endif + MTREE_FILE= ${FILESDIR}/mpd4.mtree MAN8= mpd4.8 MANCOMPRESSED= maybe USE_RC_SUBR= mpd4.sh -HTMLNUM!= jot 62 1 +HTMLNUM!= jot 67 1 CONFSUF= conf links secret script DOCSDIR= ${TARGETDIR}/share/doc/mpd4 PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README \ @@ -32,4 +40,4 @@ PLIST_FILES= ${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4 USE_OPENSSL= yes -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo index febec0430fb9..693343fffed1 100644 --- a/net/mpd5/distinfo +++ b/net/mpd5/distinfo @@ -1,3 +1,3 @@ -SIZE (mpd4/mpd-4.1.tar.gz) = 407348 -MD5 (mpd4/mpd-4.1.tar.gz) = 05528ae9f64624d9cafbb9eec3bd3a73 -SHA256 (mpd4/mpd-4.1.tar.gz) = 7c9a512b4eeacb2ada7c6bdc17e0cc7d63688115d2537248e95df377322b70eb +SIZE (mpd4/mpd-4.2.tar.gz) = 436033 +MD5 (mpd4/mpd-4.2.tar.gz) = 6e14c864a047680a4e4f2087352a072f +SHA256 (mpd4/mpd-4.2.tar.gz) = 07ec96c5ca561d53df416a4b8c274b35f510d83c87c8bb8f93152667b61fd596 diff --git a/net/mpd5/files/patch-gcc41 b/net/mpd5/files/patch-gcc41 deleted file mode 100644 index 4d90395c60e6..000000000000 --- a/net/mpd5/files/patch-gcc41 +++ /dev/null @@ -1,49 +0,0 @@ ---- src/command.h.orig Sun Feb 11 23:22:25 2007 -+++ src/command.h Fri Apr 6 09:17:50 2007 -@@ -10,6 +10,8 @@ - #ifndef _COMMAND_H_ - #define _COMMAND_H_ - -+#include "vars.h" -+ - /* - * DEFINITIONS - */ -@@ -26,8 +28,6 @@ - struct optinfo options; - }; - -- extern const struct cmdtab gCommands[]; -- - struct cmdtab; - typedef const struct cmdtab *CmdTab; - struct cmdtab -@@ -38,6 +38,8 @@ - int (*admit)(CmdTab cmd); - void *arg; - }; -+ -+ extern const struct cmdtab gCommands[]; - - /* - * FUNCTIONS ---- src/ipcp.h.orig Sun Feb 11 23:22:25 2007 -+++ src/ipcp.h Fri Apr 6 09:10:32 2007 -@@ -17,6 +17,7 @@ - #include <sys/types.h> - #include <netinet/in_systm.h> - #include <netinet/ip.h> -+#include "command.h" - #include "phys.h" - #include "fsm.h" - #include "timer.h" ---- src/ipv6cp.h.orig Sun Feb 11 23:22:25 2007 -+++ src/ipv6cp.h Fri Apr 6 09:10:51 2007 -@@ -11,6 +11,7 @@ - #include <sys/types.h> - #include <netinet/in_systm.h> - #include <netinet/ip.h> -+#include "command.h" - - /* - * DEFINITONS |