diff options
| -rw-r--r-- | dns/bind9-dlz/Makefile | 6 | ||||
| -rw-r--r-- | net/freebsd-uucp/Makefile | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile index 1559c8fbb100..db834e6d28f4 100644 --- a/dns/bind9-dlz/Makefile +++ b/dns/bind9-dlz/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_ISC} \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,dns/bind9/${ISCVERSION}/,} \ ${MASTER_SITES_DLZ:S/$/:dlz/} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} bind-dlz/:dlz -PKGNAMESUFFIX= -dlz +PKGNAMESUFFIX?= -dlz${POSTGRESQL_SUFFIX}${MYSQL_SUFFIX}${BERKLEYDB_SUFFIX}${LDAP_SUFFIX}${PKGNAMESUFFIX2} DISTFILES= bind-${ISCVERSION}.tar.gz \ DLZ-${DLZVERSION}${EXTRACT_SUFX}:dlz @@ -51,18 +51,21 @@ NO_DESCRIBE=yes .if defined(WITH_POSTGRESQL_DRIVER) .if !defined(WITHOUT_POSTGRESQL_DRIVER) +POSTGRESQL_SUFFIX= +postgres LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} CONFIGURE_ARGS+= --with-dlz-postgres .endif .endif .if defined(WITH_MYSQL_DRIVER) +MYSQL_SUFFIX= +mysql MYSQL_PORT?= databases/mysql323-client LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${MYSQL_PORT} CONFIGURE_ARGS+= --with-dlz-mysql .endif .if defined(WITH_LDAP) +LDAP_SUFFIX= +ldap LDAP_PORT?= net/openldap21-client LIB_DEPENDS+= ldap.${OPENLDAP_LIB_VER}:${PORTSDIR}/${LDAP_PORT} LIB_DEPENDS+= lber.${OPENLDAP_LIB_VER}:${PORTSDIR}/${LDAP_PORT} @@ -70,6 +73,7 @@ CONFIGURE_ARGS+= --with-dlz-ldap .endif .if defined(WITH_BERKLEYDB_DRIVER) +BERKLEYDB_SUFFIX= +db4 BERKLEYDB_PORT?= databases/db41 BERKLEYDB_LIB?= db41.1 CONFIGURE_ARGS+= --with-dlz-bdb=${LOCALBASE} diff --git a/net/freebsd-uucp/Makefile b/net/freebsd-uucp/Makefile index b6f25f2f052a..def6060c1e43 100644 --- a/net/freebsd-uucp/Makefile +++ b/net/freebsd-uucp/Makefile @@ -10,9 +10,7 @@ PORTVERSION= 1.07.2 CATEGORIES= net comms MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR=dinoex -.if defined(WITH_PAM) -PKGNAMESUFFIX?= -pam -.endif +PKGNAMESUFFIX?= ${PAM_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= FreeBSD-modified Taylor UUCP (unix-to-unix copy program) @@ -32,6 +30,7 @@ BPKGNAME= base-uucp-1.06.1 MAKE_ENV+= CSTD=gnu99 .if defined(WITH_PAM) +PAM_SUFFIX= -pam MAKE_ENV+= WITH_PAM=${WITH_PAM} CONFLICTS?= freebsd-uucp-1.* .else @@ -83,7 +82,7 @@ post-install: @if test "$$(pw usershow uucp)" != "uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:${PREFIX}/libexec/uucp/uucico"; then \ pw usermod uucp -s ${PREFIX}/libexec/uucp/uucico; fi @pw usershow uucp -.endif +.endif @${ECHO_MSG} "Use the 'make upgrade' command to copy your old configuration" @${ECHO_MSG} "files from /etc/uucp to the new location in ${PREFIX}/etc/uucp" @${ECHO_MSG} |