Date: Thu, 7 Oct 2004 20:27:48 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72417: [patch] enable options for net/ser Message-ID: <20041007102748.7B89062B7@k7.mavetju> Resent-Message-ID: <200410071030.i97AUOL5015784@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72417
>Category: ports
>Synopsis: [patch] enable options for net/ser
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 07 10:30:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #7: Tue Sep 21 23:13:39 EST 2004 root@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386
>Description:
net/ser has some nice features not being used these days.
For example: IM/Jabber support. PostgreSQL support. USE_TCP, USE_IPV6
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/ser/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 5 Feb 2004 19:57:37 -0000 1.3
+++ Makefile 7 Oct 2004 10:26:04 -0000
@@ -14,12 +14,18 @@
MAINTAINER= sobomax@FreeBSD.org
COMMENT= A very fast and configurable SIP proxy
-BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-LIB_DEPENDS= radiusclient.0:${PORTSDIR}/net/radiusclient
-RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+OPTIONS= POSTGRESQL "With PostgreSQL database support" Off \
+ MYSQL "With MySQL database support" Off \
+ RADIUS "With Radius database support" Off \
+ SHM "Enable shared memory (some modules need it)" Off \
+ SNMP "Enable SNMP support" Off \
+ TCP "Enable TCP support" Off \
+ IPV6 "Enable IPv6 support" Off \
+ JABBER "Enable Jabber support" Off \
+ IM "Enable IM support" Off \
+
USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
@@ -27,6 +33,60 @@
MAN5= ser.cfg.5
MANCOMPRESSED= no
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_POSTGRESQL)
+INCLUDE_MODULES+= postgres
+LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
+.else
+EXCLUDE_MODULES+= postgres
+PLIST_SUB+= SUB_POSTGRES="@comment "
+.endif
+
+.if defined(WITH_MYSQL)
+INCLUDE_MODULES+= mysql
+USE_MYSQL= yes
+.else
+EXCLUDE_MODULES+= mysql
+PLIST_SUB+= SUB_MYSQL="@comment "
+.endif
+
+.if defined(WITH_RADIUS)
+INCLUDE_MODULES+= radius_acc radius_auth group_radius uri_radius
+.else
+EXCLUDE_MODULES+= radius_acc radius_auth group_radius uri_radius
+.endif
+
+.if defined(WITH_SHM)
+EXTRA_DEFS+= -DSHM_MEM -DSHM_MMAP
+.endif
+
+.if defined(WITH_TCP)
+EXTRA_DEFS+= -DUSE_TCP
+.endif
+
+.if defined(WITH_IPV6)
+EXTRA_DEFS+= -DUSE_IPV6
+.endif
+
+.if defined(WITH_JABBER)
+INCLUDE_MODULES+= jabber
+.else
+EXCLUDE_MODULES+= jabber
+PLIST_SUB+= SUB_JABBER="@comment "
+.endif
+
+.if defined(WITH_IM)
+INCLUDE_MODULES+= im
+.else
+EXCLUDE_MODULES+= im
+PLIST_SUB+= SUB_IM="@comment "
+.endif
+
+MAKE_ENV+= include_modules="${INCLUDE_MODULES}"
+MAKE_ENV+= exclude_modules="${EXCLUDE_MODULES}"
+MAKE_ENV+= extra_defs="${EXTRA_DEFS}"
+
post-install:
${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/modules/acc/etc/radiusclient.conf > \
@@ -42,4 +102,4 @@
${PREFIX}/etc/ser/radiusclient.conf; \
fi
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/ser/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 5 Feb 2004 19:57:37 -0000 1.2
+++ pkg-plist 7 Oct 2004 10:26:04 -0000
@@ -12,15 +12,18 @@
lib/ser/modules/enum.so
lib/ser/modules/exec.so
lib/ser/modules/group.so
+%%SUB_JABBER%%lib/ser/modules/im.so
+%%SUB_JABBER%%lib/ser/modules/jabber.so
lib/ser/modules/mangler.so
lib/ser/modules/maxfwd.so
lib/ser/modules/msilo.so
-lib/ser/modules/mysql.so
+%%SUB_MYSQL%%lib/ser/modules/mysql.so
lib/ser/modules/nathelper.so
lib/ser/modules/pa.so
lib/ser/modules/pdt.so
lib/ser/modules/permissions.so
lib/ser/modules/pike.so
+%%SUB_POSTGRES%%lib/ser/modules/postgres.so
lib/ser/modules/print.so
lib/ser/modules/registrar.so
lib/ser/modules/rr.so
@@ -51,6 +54,7 @@
share/doc/ser/README.enum
share/doc/ser/README.exec
share/doc/ser/README.group
+%%SUB_JABBER%%share/doc/ser/README.jabber
share/doc/ser/README.mangler
share/doc/ser/README.maxfwd
share/doc/ser/README.msilo
@@ -59,6 +63,7 @@
share/doc/ser/README.pdt
share/doc/ser/README.permissions
share/doc/ser/README.pike
+%%SUB_POSTGRES%%share/doc/ser/README.postgres
share/doc/ser/README.print
share/doc/ser/README.registrar
share/doc/ser/README.rr
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041007102748.7B89062B7>