From efe3195bcafab9226191dbd3419157900f900b1c Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 5 Feb 2015 14:45:17 +0000 Subject: [PATCH] Cleanup plist --- misc/compat10x/pkg-plist.amd64 | 3 --- misc/compat4x/pkg-plist.freebsd4 | 1 - misc/compat4x/pkg-plist.freebsd5 | 2 -- misc/compat6x/pkg-plist.alpha | 1 - misc/compat6x/pkg-plist.amd64 | 3 --- misc/compat6x/pkg-plist.i386 | 1 - misc/compat6x/pkg-plist.sparc64 | 1 - misc/compat7x/pkg-plist.amd64 | 3 --- misc/compat7x/pkg-plist.i386 | 1 - misc/compat8x/pkg-plist.amd64 | 3 --- misc/compat8x/pkg-plist.i386 | 1 - misc/compat9x/pkg-plist.amd64 | 3 --- misc/compat9x/pkg-plist.i386 | 1 - 13 files changed, 24 deletions(-) diff --git a/misc/compat10x/pkg-plist.amd64 b/misc/compat10x/pkg-plist.amd64 index 5559a36581ae..d510c9e27288 100644 --- a/misc/compat10x/pkg-plist.amd64 +++ b/misc/compat10x/pkg-plist.amd64 @@ -14,7 +14,4 @@ lib32/compat/libipx.so.5 lib32/compat/libopie.so.7 lib32/compat/libreadline.so.8 lib32/compat/libsbuf.so.6 -@dirrmtry lib/compat -@dirrmtry lib32/compat -@dirrmtry lib32 @exec %%LDCONFIG_LIB32%% -m %D/lib32/compat diff --git a/misc/compat4x/pkg-plist.freebsd4 b/misc/compat4x/pkg-plist.freebsd4 index 35824c35b003..ce84aa37663e 100644 --- a/misc/compat4x/pkg-plist.freebsd4 +++ b/misc/compat4x/pkg-plist.freebsd4 @@ -3,4 +3,3 @@ lib/compat/libfetch.so.2 %%FORBIDDEN:%%lib/compat/libssl.so.1 %%FORBIDDEN:%%lib/compat/libssl.so.2 -@dirrmtry lib/compat diff --git a/misc/compat4x/pkg-plist.freebsd5 b/misc/compat4x/pkg-plist.freebsd5 index 67b4b7e4810c..55f5ac37edc3 100644 --- a/misc/compat4x/pkg-plist.freebsd5 +++ b/misc/compat4x/pkg-plist.freebsd5 @@ -38,6 +38,4 @@ %%LIBDIR%%/compat/pam_tacplus.so %%LIBDIR%%/compat/pam_unix.so %%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat -@dirrmtry %%LIBDIR%%/compat @comment Hardcode lib32 since we should not remove lib. -%%AMD64_ONLY%%@dirrmtry lib32 diff --git a/misc/compat6x/pkg-plist.alpha b/misc/compat6x/pkg-plist.alpha index 441bf8ba9cd1..82f3a04170ef 100644 --- a/misc/compat6x/pkg-plist.alpha +++ b/misc/compat6x/pkg-plist.alpha @@ -106,4 +106,3 @@ lib/compat/snmp_hostres.so.4 lib/compat/snmp_mibII.so.4 lib/compat/snmp_netgraph.so.4 lib/compat/snmp_pf.so.4 -@dirrmtry lib/compat diff --git a/misc/compat6x/pkg-plist.amd64 b/misc/compat6x/pkg-plist.amd64 index c9a95cb0b01b..9afff0862f06 100644 --- a/misc/compat6x/pkg-plist.amd64 +++ b/misc/compat6x/pkg-plist.amd64 @@ -207,7 +207,4 @@ lib32/compat/pam_self.so.3 lib32/compat/pam_ssh.so.3 lib32/compat/pam_tacplus.so.3 lib32/compat/pam_unix.so.3 -@dirrmtry lib/compat -@dirrmtry lib32/compat -@dirrmtry lib32 @exec %%LDCONFIG_LIB32%% -m %D/lib32/compat diff --git a/misc/compat6x/pkg-plist.i386 b/misc/compat6x/pkg-plist.i386 index 4528b245ca7e..4f1f03fd8fc5 100644 --- a/misc/compat6x/pkg-plist.i386 +++ b/misc/compat6x/pkg-plist.i386 @@ -110,4 +110,3 @@ lib/compat/snmp_hostres.so.4 lib/compat/snmp_mibII.so.4 lib/compat/snmp_netgraph.so.4 lib/compat/snmp_pf.so.4 -@dirrmtry lib/compat diff --git a/misc/compat6x/pkg-plist.sparc64 b/misc/compat6x/pkg-plist.sparc64 index 528016d92bf9..c892368c53a3 100644 --- a/misc/compat6x/pkg-plist.sparc64 +++ b/misc/compat6x/pkg-plist.sparc64 @@ -107,4 +107,3 @@ lib/compat/snmp_hostres.so.4 lib/compat/snmp_mibII.so.4 lib/compat/snmp_netgraph.so.4 lib/compat/snmp_pf.so.4 -@dirrmtry lib/compat diff --git a/misc/compat7x/pkg-plist.amd64 b/misc/compat7x/pkg-plist.amd64 index db45390a7bf3..3a0db4c3a055 100644 --- a/misc/compat7x/pkg-plist.amd64 +++ b/misc/compat7x/pkg-plist.amd64 @@ -222,7 +222,4 @@ lib32/compat/pam_self.so.4 lib32/compat/pam_ssh.so.4 lib32/compat/pam_tacplus.so.4 lib32/compat/pam_unix.so.4 -@dirrmtry lib/compat -@dirrmtry lib32/compat -@dirrmtry lib32 @exec %%LDCONFIG_LIB32%% -m %D/lib32/compat diff --git a/misc/compat7x/pkg-plist.i386 b/misc/compat7x/pkg-plist.i386 index eef0f57526d6..1486bc1a435e 100644 --- a/misc/compat7x/pkg-plist.i386 +++ b/misc/compat7x/pkg-plist.i386 @@ -114,4 +114,3 @@ lib/compat/snmp_hostres.so.5 lib/compat/snmp_mibII.so.5 lib/compat/snmp_netgraph.so.5 lib/compat/snmp_pf.so.5 -@dirrmtry lib/compat diff --git a/misc/compat8x/pkg-plist.amd64 b/misc/compat8x/pkg-plist.amd64 index 6e39ea2a4390..a68f7db30d8e 100644 --- a/misc/compat8x/pkg-plist.amd64 +++ b/misc/compat8x/pkg-plist.amd64 @@ -22,7 +22,4 @@ lib32/compat/libtacplus.so.4 lib32/compat/libufs.so.5 lib32/compat/libutil.so.8 lib32/compat/libz.so.5 -@dirrmtry lib/compat -@dirrmtry lib32/compat -@dirrmtry lib32 @exec %%LDCONFIG_LIB32%% -m %D/lib32/compat diff --git a/misc/compat8x/pkg-plist.i386 b/misc/compat8x/pkg-plist.i386 index 06e13004bc42..dec19f754f35 100644 --- a/misc/compat8x/pkg-plist.i386 +++ b/misc/compat8x/pkg-plist.i386 @@ -10,4 +10,3 @@ lib/compat/libtacplus.so.4 lib/compat/libufs.so.5 lib/compat/libutil.so.8 lib/compat/libz.so.5 -@dirrmtry lib/compat diff --git a/misc/compat9x/pkg-plist.amd64 b/misc/compat9x/pkg-plist.amd64 index 8eebafd06fd2..7865b833ea48 100644 --- a/misc/compat9x/pkg-plist.amd64 +++ b/misc/compat9x/pkg-plist.amd64 @@ -41,7 +41,4 @@ lib32/compat/libssl.so.6 lib32/compat/libstdc++.so.6 lib32/compat/libsupc++.so.1 lib32/compat/libusb.so.2 -@dirrmtry lib/compat -@dirrmtry lib32/compat -@dirrmtry lib32 @exec %%LDCONFIG_LIB32%% -m %D/lib32/compat diff --git a/misc/compat9x/pkg-plist.i386 b/misc/compat9x/pkg-plist.i386 index 4447b1175587..81ffdf625ad8 100644 --- a/misc/compat9x/pkg-plist.i386 +++ b/misc/compat9x/pkg-plist.i386 @@ -20,4 +20,3 @@ lib/compat/libssl.so.6 lib/compat/libstdc++.so.6 lib/compat/libsupc++.so.1 lib/compat/libusb.so.2 -@dirrmtry lib/compat