aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/citrix_ica/Makefile1
-rw-r--r--net/linux-c6-avahi-libs/Makefile13
-rw-r--r--net/linux-c6-avahi-libs/distinfo7
-rw-r--r--net/linux-c6-avahi-libs/distinfo.i3865
-rw-r--r--net/linux-c6-avahi-libs/distinfo.x86_647
-rw-r--r--net/linux-c6-avahi-libs/pkg-plist.amd64 (renamed from net/linux-c6-avahi-libs/pkg-plist.x86_64)0
-rw-r--r--net/linux-c6-openldap/Makefile16
-rw-r--r--net/linux-c6-openldap/distinfo7
-rw-r--r--net/linux-c6-openldap/distinfo.i3865
-rw-r--r--net/linux-c6-openldap/distinfo.x86_647
-rw-r--r--net/linux-c6-openldap/pkg-plist.amd6425
-rw-r--r--net/linux-c6-openldap/pkg-plist.i38621
-rw-r--r--net/linux-c6-openldap/pkg-plist.x86_6420
-rw-r--r--net/linux-c6-tcp_wrappers-libs/Makefile12
-rw-r--r--net/linux-c6-tcp_wrappers-libs/distinfo7
-rw-r--r--net/linux-c6-tcp_wrappers-libs/distinfo.i3865
-rw-r--r--net/linux-c6-tcp_wrappers-libs/distinfo.x86_647
-rw-r--r--net/linux-c6-tcp_wrappers-libs/pkg-plist.amd6415
-rw-r--r--net/linux-c6-tcp_wrappers-libs/pkg-plist.i38618
-rw-r--r--net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_6415
-rw-r--r--net/linux-c7-avahi-libs/Makefile11
-rw-r--r--net/linux-c7-avahi-libs/distinfo (renamed from net/linux-c7-avahi-libs/distinfo.x86_64)0
-rw-r--r--net/linux-c7-avahi-libs/pkg-plist.amd64 (renamed from net/linux-c7-avahi-libs/pkg-plist.x86_64)0
-rw-r--r--net/linux-c7-openldap/Makefile8
-rw-r--r--net/linux-c7-openldap/distinfo (renamed from net/linux-c7-openldap/distinfo.x86_64)0
-rw-r--r--net/linux-c7-openldap/pkg-plist.amd64 (renamed from net/linux-c7-openldap/pkg-plist.x86_64)5
-rw-r--r--net/linux-c7-tcp_wrappers-libs/Makefile10
-rw-r--r--net/linux-c7-tcp_wrappers-libs/distinfo (renamed from net/linux-c7-tcp_wrappers-libs/distinfo.x86_64)0
-rw-r--r--net/linux-c7-tcp_wrappers-libs/pkg-plist.amd64 (renamed from net/linux-c7-tcp_wrappers-libs/pkg-plist.x86_64)0
29 files changed, 123 insertions, 124 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index e8504963d8c1..d251dc04b6d5 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -3,6 +3,7 @@
PORTNAME= citrix_ica
PORTVERSION= 13.4.0
+PORTREVISION= 1
CATEGORIES= net comms linux
MASTER_SITES= #
DISTNAME= linuxx86-${PORTVERSION}.10109380
diff --git a/net/linux-c6-avahi-libs/Makefile b/net/linux-c6-avahi-libs/Makefile
index 7779610b97af..72684cd9d660 100644
--- a/net/linux-c6-avahi-libs/Makefile
+++ b/net/linux-c6-avahi-libs/Makefile
@@ -1,20 +1,21 @@
# Created by: lme
# $FreeBSD$
-PORTNAME= avahi-libs
+PORTNAME= avahi
PORTVERSION= 0.6.25
PORTREVISION= 4
CATEGORIES= net linux
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER})
-USES= linux:c6
-USE_LINUX_RPM= yes
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 15.el6_8.1
+USES= linux:c6
USE_LDCONFIG= yes
-SRC_DISTFILES= ${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-DESCR= ${.CURDIR}/../avahi/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/net/linux-c6-avahi-libs/distinfo b/net/linux-c6-avahi-libs/distinfo
new file mode 100644
index 000000000000..d20e1f733547
--- /dev/null
+++ b/net/linux-c6-avahi-libs/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485615388
+SHA256 (centos/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 926c94db33c0b9cd9bdb0a40a6afd24b88a78c69f03ddbe1cac4bca4ee4227d3
+SIZE (centos/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 56048
+SHA256 (centos/avahi-libs-0.6.25-15.el6_8.1.x86_64.rpm) = 589cf55426eefdf913e642ef143d02f35feca5833e05a4a22fb668479f511a7c
+SIZE (centos/avahi-libs-0.6.25-15.el6_8.1.x86_64.rpm) = 56076
+SHA256 (centos/avahi-0.6.25-15.el6_8.1.src.rpm) = 41c2b606ed52dc56b3c8ed17026c225987518cd29da0dfb5e2e49a2a5cf7f8f5
+SIZE (centos/avahi-0.6.25-15.el6_8.1.src.rpm) = 1139504
diff --git a/net/linux-c6-avahi-libs/distinfo.i386 b/net/linux-c6-avahi-libs/distinfo.i386
deleted file mode 100644
index 711e47d9409b..000000000000
--- a/net/linux-c6-avahi-libs/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1472387540
-SHA256 (rpm/i686/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 926c94db33c0b9cd9bdb0a40a6afd24b88a78c69f03ddbe1cac4bca4ee4227d3
-SIZE (rpm/i686/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 56048
-SHA256 (rpm/i686/centos/6.8/avahi-0.6.25-15.el6_8.1.src.rpm) = 41c2b606ed52dc56b3c8ed17026c225987518cd29da0dfb5e2e49a2a5cf7f8f5
-SIZE (rpm/i686/centos/6.8/avahi-0.6.25-15.el6_8.1.src.rpm) = 1139504
diff --git a/net/linux-c6-avahi-libs/distinfo.x86_64 b/net/linux-c6-avahi-libs/distinfo.x86_64
deleted file mode 100644
index fbe4db0312c9..000000000000
--- a/net/linux-c6-avahi-libs/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1472387716
-SHA256 (rpm/x86_64/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.x86_64.rpm) = 589cf55426eefdf913e642ef143d02f35feca5833e05a4a22fb668479f511a7c
-SIZE (rpm/x86_64/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.x86_64.rpm) = 56076
-SHA256 (rpm/x86_64/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 926c94db33c0b9cd9bdb0a40a6afd24b88a78c69f03ddbe1cac4bca4ee4227d3
-SIZE (rpm/x86_64/centos/6.8/avahi-libs-0.6.25-15.el6_8.1.i686.rpm) = 56048
-SHA256 (rpm/x86_64/centos/6.8/avahi-0.6.25-15.el6_8.1.src.rpm) = 41c2b606ed52dc56b3c8ed17026c225987518cd29da0dfb5e2e49a2a5cf7f8f5
-SIZE (rpm/x86_64/centos/6.8/avahi-0.6.25-15.el6_8.1.src.rpm) = 1139504
diff --git a/net/linux-c6-avahi-libs/pkg-plist.x86_64 b/net/linux-c6-avahi-libs/pkg-plist.amd64
index 30f641933191..30f641933191 100644
--- a/net/linux-c6-avahi-libs/pkg-plist.x86_64
+++ b/net/linux-c6-avahi-libs/pkg-plist.amd64
diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile
index 2ee2714c0286..ba2a01e6f569 100644
--- a/net/linux-c6-openldap/Makefile
+++ b/net/linux-c6-openldap/Makefile
@@ -3,26 +3,22 @@
PORTNAME= openldap
PORTVERSION= 2.4.40
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Lightweight Directory Access Protocol libraries (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-openldap-[0-9]*
-
+DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
+RPMVERSION= 12.el6
USES= linux:c6
+USE_LDCONFIG= yes
USE_LINUX= cyrus-sasl2 nss nspr
-RPMVERSION= 12.el6
USE_LINUX_RPM= yes
-USE_LDCONFIG= yes
-DESCR= ${.CURDIR}/../openldap24-server/pkg-descr
-
-PORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
# do not install any openldap configuration directories/files
-post-extract:
- ${RM} -r ${WRKSRC}/etc
+post-patch:
+ @${RM} -r ${WRKSRC}/etc
# use a native openldap configuration directories/files
post-install:
diff --git a/net/linux-c6-openldap/distinfo b/net/linux-c6-openldap/distinfo
new file mode 100644
index 000000000000..097c67b500a1
--- /dev/null
+++ b/net/linux-c6-openldap/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485615698
+SHA256 (centos/openldap-2.4.40-12.el6.i686.rpm) = bb9af0c42eff21b38f3f533d84d4822c1344d077e555c7cfa7fa9184793b5b76
+SIZE (centos/openldap-2.4.40-12.el6.i686.rpm) = 291788
+SHA256 (centos/openldap-2.4.40-12.el6.x86_64.rpm) = cb55ba3a030a9bd7c21f0411d3fa25771f58d192b86139fcccef538db907608c
+SIZE (centos/openldap-2.4.40-12.el6.x86_64.rpm) = 290648
+SHA256 (centos/openldap-2.4.40-12.el6.src.rpm) = 9cd02f6ac5b588e57b804db189630088fa197ee0f1cc41f483749d4dccbcc95e
+SIZE (centos/openldap-2.4.40-12.el6.src.rpm) = 5733071
diff --git a/net/linux-c6-openldap/distinfo.i386 b/net/linux-c6-openldap/distinfo.i386
deleted file mode 100644
index b00803050786..000000000000
--- a/net/linux-c6-openldap/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256803
-SHA256 (rpm/i686/centos/6.8/openldap-2.4.40-12.el6.i686.rpm) = bb9af0c42eff21b38f3f533d84d4822c1344d077e555c7cfa7fa9184793b5b76
-SIZE (rpm/i686/centos/6.8/openldap-2.4.40-12.el6.i686.rpm) = 291788
-SHA256 (rpm/i686/centos/6.8/openldap-2.4.40-12.el6.src.rpm) = 9cd02f6ac5b588e57b804db189630088fa197ee0f1cc41f483749d4dccbcc95e
-SIZE (rpm/i686/centos/6.8/openldap-2.4.40-12.el6.src.rpm) = 5733071
diff --git a/net/linux-c6-openldap/distinfo.x86_64 b/net/linux-c6-openldap/distinfo.x86_64
deleted file mode 100644
index b10914d98d47..000000000000
--- a/net/linux-c6-openldap/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257427
-SHA256 (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.x86_64.rpm) = cb55ba3a030a9bd7c21f0411d3fa25771f58d192b86139fcccef538db907608c
-SIZE (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.x86_64.rpm) = 290648
-SHA256 (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.i686.rpm) = bb9af0c42eff21b38f3f533d84d4822c1344d077e555c7cfa7fa9184793b5b76
-SIZE (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.i686.rpm) = 291788
-SHA256 (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.src.rpm) = 9cd02f6ac5b588e57b804db189630088fa197ee0f1cc41f483749d4dccbcc95e
-SIZE (rpm/x86_64/centos/6.8/openldap-2.4.40-12.el6.src.rpm) = 5733071
diff --git a/net/linux-c6-openldap/pkg-plist.amd64 b/net/linux-c6-openldap/pkg-plist.amd64
new file mode 100644
index 000000000000..e9db4796721e
--- /dev/null
+++ b/net/linux-c6-openldap/pkg-plist.amd64
@@ -0,0 +1,25 @@
+%%ETCDIR%%
+usr/lib/liblber-2.4.so.2
+usr/lib/liblber-2.4.so.2.10.3
+usr/lib/libldap-2.4.so.2
+usr/lib/libldap-2.4.so.2.10.3
+usr/lib/libldap_r-2.4.so.2
+usr/lib/libldap_r-2.4.so.2.10.3
+usr/lib/libldif-2.4.so.2
+usr/lib/libldif-2.4.so.2.10.3
+usr/lib64/liblber-2.4.so.2
+usr/lib64/liblber-2.4.so.2.10.3
+usr/lib64/libldap-2.4.so.2
+usr/lib64/libldap-2.4.so.2.10.3
+usr/lib64/libldap_r-2.4.so.2
+usr/lib64/libldap_r-2.4.so.2.10.3
+usr/lib64/libldif-2.4.so.2
+usr/lib64/libldif-2.4.so.2.10.3
+usr/libexec/openldap/create-certdb.sh
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/man/man5/ldap.conf.5.gz
+usr/share/man/man5/ldif.5.gz
diff --git a/net/linux-c6-openldap/pkg-plist.i386 b/net/linux-c6-openldap/pkg-plist.i386
index 3c40926c98ab..feec9efb376d 100644
--- a/net/linux-c6-openldap/pkg-plist.i386
+++ b/net/linux-c6-openldap/pkg-plist.i386
@@ -1,12 +1,17 @@
%%ETCDIR%%
-lib/liblber-2.4.so.2
-lib/liblber-2.4.so.2.10.3
-lib/libldap-2.4.so.2
-lib/libldap-2.4.so.2.10.3
-lib/libldap_r-2.4.so.2
-lib/libldap_r-2.4.so.2.10.3
-lib/libldif-2.4.so.2
-lib/libldif-2.4.so.2.10.3
+usr/lib/liblber-2.4.so.2
+usr/lib/liblber-2.4.so.2.10.3
+usr/lib/libldap-2.4.so.2
+usr/lib/libldap-2.4.so.2.10.3
+usr/lib/libldap_r-2.4.so.2
+usr/lib/libldap_r-2.4.so.2.10.3
+usr/lib/libldif-2.4.so.2
+usr/lib/libldif-2.4.so.2.10.3
usr/libexec/openldap/create-certdb.sh
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/man/man5/ldap.conf.5.gz
usr/share/man/man5/ldif.5.gz
diff --git a/net/linux-c6-openldap/pkg-plist.x86_64 b/net/linux-c6-openldap/pkg-plist.x86_64
deleted file mode 100644
index feb70ed0193c..000000000000
--- a/net/linux-c6-openldap/pkg-plist.x86_64
+++ /dev/null
@@ -1,20 +0,0 @@
-%%ETCDIR%%
-lib/liblber-2.4.so.2
-lib/liblber-2.4.so.2.10.3
-lib/libldap-2.4.so.2
-lib/libldap-2.4.so.2.10.3
-lib/libldap_r-2.4.so.2
-lib/libldap_r-2.4.so.2.10.3
-lib/libldif-2.4.so.2
-lib/libldif-2.4.so.2.10.3
-lib64/liblber-2.4.so.2
-lib64/liblber-2.4.so.2.10.3
-lib64/libldap-2.4.so.2
-lib64/libldap-2.4.so.2.10.3
-lib64/libldap_r-2.4.so.2
-lib64/libldap_r-2.4.so.2.10.3
-lib64/libldif-2.4.so.2
-lib64/libldif-2.4.so.2.10.3
-usr/libexec/openldap/create-certdb.sh
-usr/share/man/man5/ldap.conf.5.gz
-usr/share/man/man5/ldif.5.gz
diff --git a/net/linux-c6-tcp_wrappers-libs/Makefile b/net/linux-c6-tcp_wrappers-libs/Makefile
index 4d4cf40bec4e..670d083c5e7a 100644
--- a/net/linux-c6-tcp_wrappers-libs/Makefile
+++ b/net/linux-c6-tcp_wrappers-libs/Makefile
@@ -1,22 +1,22 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= tcp_wrappers-libs
+PORTNAME= tcp_wrappers
PORTVERSION= 7.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net linux
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 58.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
-DOCSDIR= ${PREFIX}/usr/share/doc/tcp_wrappers-${PORTVERSION}
-
-SRC_DISTFILES= tcp_wrappers-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
.include <bsd.port.mk>
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo b/net/linux-c6-tcp_wrappers-libs/distinfo
new file mode 100644
index 000000000000..4f293c49c8db
--- /dev/null
+++ b/net/linux-c6-tcp_wrappers-libs/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485616094
+SHA256 (centos/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
+SIZE (centos/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
+SHA256 (centos/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 55f21f483ee7d6f8ce6a0ce4c8c33efd10f6ec237d73a9ad7ee146cd8b2cd7c6
+SIZE (centos/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 63656
+SHA256 (centos/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
+SIZE (centos/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo.i386 b/net/linux-c6-tcp_wrappers-libs/distinfo.i386
deleted file mode 100644
index a8f4fe0a0a23..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256802
-SHA256 (rpm/i686/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
-SIZE (rpm/i686/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
-SHA256 (rpm/i686/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
-SIZE (rpm/i686/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64 b/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64
deleted file mode 100644
index d66a90c302e3..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257421
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 55f21f483ee7d6f8ce6a0ce4c8c33efd10f6ec237d73a9ad7ee146cd8b2cd7c6
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 63656
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64
new file mode 100644
index 000000000000..1e8f53d6b581
--- /dev/null
+++ b/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64
@@ -0,0 +1,15 @@
+usr/lib/libwrap.so.0
+usr/lib/libwrap.so.0.7.6
+usr/lib64/libwrap.so.0
+usr/lib64/libwrap.so.0.7.6
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/Banners.Makefile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
+%%PORTDOCS%%%%DOCSDIR%%/README.NIS
+usr/share/man/man5/hosts.allow.5.gz
+usr/share/man/man5/hosts.deny.5.gz
+usr/share/man/man5/hosts_access.5.gz
+usr/share/man/man5/hosts_options.5.gz
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
index 70b742e57c30..136a5ba2e12f 100644
--- a/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
+++ b/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
@@ -1,12 +1,12 @@
-lib/libwrap.so.0
-lib/libwrap.so.0.7.6
-usr/share/doc/tcp_wrappers-libs-7.6/BLURB
-usr/share/doc/tcp_wrappers-libs-7.6/Banners.Makefile
-usr/share/doc/tcp_wrappers-libs-7.6/CHANGES
-usr/share/doc/tcp_wrappers-libs-7.6/DISCLAIMER
-usr/share/doc/tcp_wrappers-libs-7.6/README
-usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
-usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
+usr/lib/libwrap.so.0
+usr/lib/libwrap.so.0.7.6
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/Banners.Makefile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
+%%PORTDOCS%%%%DOCSDIR%%/README.NIS
usr/share/man/man5/hosts.allow.5.gz
usr/share/man/man5/hosts.deny.5.gz
usr/share/man/man5/hosts_access.5.gz
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64
deleted file mode 100644
index 05bfa43c477f..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/libwrap.so.0
-lib/libwrap.so.0.7.6
-lib64/libwrap.so.0
-lib64/libwrap.so.0.7.6
-usr/share/doc/tcp_wrappers-libs-7.6/BLURB
-usr/share/doc/tcp_wrappers-libs-7.6/Banners.Makefile
-usr/share/doc/tcp_wrappers-libs-7.6/CHANGES
-usr/share/doc/tcp_wrappers-libs-7.6/DISCLAIMER
-usr/share/doc/tcp_wrappers-libs-7.6/README
-usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
-usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
-usr/share/man/man5/hosts.allow.5.gz
-usr/share/man/man5/hosts.deny.5.gz
-usr/share/man/man5/hosts_access.5.gz
-usr/share/man/man5/hosts_options.5.gz
diff --git a/net/linux-c7-avahi-libs/Makefile b/net/linux-c7-avahi-libs/Makefile
index b8936bc04462..4e7c23f94938 100644
--- a/net/linux-c7-avahi-libs/Makefile
+++ b/net/linux-c7-avahi-libs/Makefile
@@ -1,22 +1,23 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
# $FreeBSD$
-PORTNAME= avahi-libs
+PORTNAME= avahi
PORTVERSION= 0.6.31
PORTREVISION= 1
CATEGORIES= net linux
-SRC_DISTFILES= avahi-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for Avahi (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 17.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../avahi/pkg-descr
-
.include <bsd.port.mk>
diff --git a/net/linux-c7-avahi-libs/distinfo.x86_64 b/net/linux-c7-avahi-libs/distinfo
index 50c3b0644829..50c3b0644829 100644
--- a/net/linux-c7-avahi-libs/distinfo.x86_64
+++ b/net/linux-c7-avahi-libs/distinfo
diff --git a/net/linux-c7-avahi-libs/pkg-plist.x86_64 b/net/linux-c7-avahi-libs/pkg-plist.amd64
index 973e4ecbae5e..973e4ecbae5e 100644
--- a/net/linux-c7-avahi-libs/pkg-plist.x86_64
+++ b/net/linux-c7-avahi-libs/pkg-plist.amd64
diff --git a/net/linux-c7-openldap/Makefile b/net/linux-c7-openldap/Makefile
index 2894dfe125af..8ce591cb2c62 100644
--- a/net/linux-c7-openldap/Makefile
+++ b/net/linux-c7-openldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openldap
PORTVERSION= 2.4.40
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net linux
MAINTAINER= emulation@FreeBSD.org
@@ -11,18 +11,16 @@ COMMENT= LDAP libraries (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
RPMVERSION= 13.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= cyrus-sasl2 nspr nss
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
-PORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
-
# do not install any openldap configuration directories/files
post-patch:
- ${RM} -rf ${WRKSRC}/etc
+ @${RM} -r ${WRKSRC}/etc
# use a native openldap configuration directories/files
post-install:
diff --git a/net/linux-c7-openldap/distinfo.x86_64 b/net/linux-c7-openldap/distinfo
index 7f63786a847d..7f63786a847d 100644
--- a/net/linux-c7-openldap/distinfo.x86_64
+++ b/net/linux-c7-openldap/distinfo
diff --git a/net/linux-c7-openldap/pkg-plist.x86_64 b/net/linux-c7-openldap/pkg-plist.amd64
index bba7e4acc4d7..ab61043af1d7 100644
--- a/net/linux-c7-openldap/pkg-plist.x86_64
+++ b/net/linux-c7-openldap/pkg-plist.amd64
@@ -16,5 +16,10 @@ usr/lib64/libldap_r-2.4.so.2.10.3
usr/lib64/libslapi-2.4.so.2
usr/lib64/libslapi-2.4.so.2.10.3
usr/libexec/openldap/create-certdb.sh
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/man/man5/ldap.conf.5.gz
usr/share/man/man5/ldif.5.gz
diff --git a/net/linux-c7-tcp_wrappers-libs/Makefile b/net/linux-c7-tcp_wrappers-libs/Makefile
index 0d4d548dc013..f8b05929caa4 100644
--- a/net/linux-c7-tcp_wrappers-libs/Makefile
+++ b/net/linux-c7-tcp_wrappers-libs/Makefile
@@ -1,22 +1,24 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
# $FreeBSD$
-PORTNAME= tcp_wrappers-libs
+PORTNAME= tcp_wrappers
PORTVERSION= 7.6
PORTREVISION= 2
CATEGORIES= net linux
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${LINUXNAME}-[0-9]*
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 77.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
-SRC_DISTFILES= tcp_wrappers-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
.include <bsd.port.mk>
diff --git a/net/linux-c7-tcp_wrappers-libs/distinfo.x86_64 b/net/linux-c7-tcp_wrappers-libs/distinfo
index e85c80368cc6..e85c80368cc6 100644
--- a/net/linux-c7-tcp_wrappers-libs/distinfo.x86_64
+++ b/net/linux-c7-tcp_wrappers-libs/distinfo
diff --git a/net/linux-c7-tcp_wrappers-libs/pkg-plist.x86_64 b/net/linux-c7-tcp_wrappers-libs/pkg-plist.amd64
index 0451f342521e..0451f342521e 100644
--- a/net/linux-c7-tcp_wrappers-libs/pkg-plist.x86_64
+++ b/net/linux-c7-tcp_wrappers-libs/pkg-plist.amd64