aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/linux_base-c6/Makefile6
-rw-r--r--emulators/linux_base-c6/pkg-descr2
-rw-r--r--emulators/linux_base-c6/pkg-plist14
-rw-r--r--emulators/linux_base-f10/Makefile6
-rw-r--r--emulators/linux_base-f10/pkg-descr2
-rw-r--r--emulators/linux_base-f10/pkg-plist14
-rw-r--r--emulators/linux_base-f7/Makefile6
-rw-r--r--emulators/linux_base-f7/pkg-descr2
-rw-r--r--emulators/linux_base-f7/pkg-plist14
-rw-r--r--emulators/linux_base-f8/Makefile6
-rw-r--r--emulators/linux_base-f8/pkg-descr2
-rw-r--r--emulators/linux_base-f8/pkg-plist14
-rw-r--r--emulators/linux_base-f9/Makefile6
-rw-r--r--emulators/linux_base-f9/linux_base-f8/Makefile6
-rw-r--r--emulators/linux_base-f9/linux_base-f8/pkg-descr2
-rw-r--r--emulators/linux_base-f9/linux_base-f8/pkg-plist14
-rw-r--r--emulators/linux_base-f9/pkg-descr2
-rw-r--r--emulators/linux_base-f9/pkg-plist14
-rw-r--r--emulators/linux_base-fc7/Makefile6
-rw-r--r--emulators/linux_base-fc7/pkg-descr2
-rw-r--r--emulators/linux_base-fc7/pkg-plist14
21 files changed, 140 insertions, 14 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-c6/pkg-descr b/emulators/linux_base-c6/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-c6/pkg-descr
+++ b/emulators/linux_base-c6/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-c6/pkg-plist b/emulators/linux_base-c6/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-c6/pkg-plist
+++ b/emulators/linux_base-c6/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-f10/pkg-descr b/emulators/linux_base-f10/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-f10/pkg-descr
+++ b/emulators/linux_base-f10/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-f10/pkg-plist b/emulators/linux_base-f10/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-f10/pkg-plist
+++ b/emulators/linux_base-f10/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-f7/Makefile
+++ b/emulators/linux_base-f7/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-f7/pkg-descr b/emulators/linux_base-f7/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-f7/pkg-descr
+++ b/emulators/linux_base-f7/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-f7/pkg-plist b/emulators/linux_base-f7/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-f7/pkg-plist
+++ b/emulators/linux_base-f7/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-f8/pkg-descr b/emulators/linux_base-f8/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-f8/pkg-descr
+++ b/emulators/linux_base-f8/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-f8/pkg-plist b/emulators/linux_base-f8/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-f8/pkg-plist
+++ b/emulators/linux_base-f8/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-f9/linux_base-f8/pkg-descr b/emulators/linux_base-f9/linux_base-f8/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-f9/linux_base-f8/pkg-descr
+++ b/emulators/linux_base-f9/linux_base-f8/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-f9/linux_base-f8/pkg-plist b/emulators/linux_base-f9/linux_base-f8/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-f9/linux_base-f8/pkg-plist
+++ b/emulators/linux_base-f9/linux_base-f8/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-f9/pkg-descr b/emulators/linux_base-f9/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-f9/pkg-descr
+++ b/emulators/linux_base-f9/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-f9/pkg-plist b/emulators/linux_base-f9/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-f9/pkg-plist
+++ b/emulators/linux_base-f9/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x
diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile
index 4e42bfbfea76..078a911f539c 100644
--- a/emulators/linux_base-fc7/Makefile
+++ b/emulators/linux_base-fc7/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fc7
PORTVERSION= 7
+PORTREVISION= 1
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Fedora
@@ -128,6 +129,8 @@ REMOVE_DIRS= boot dev home initrd root tmp var/log var/run var/tmp \
REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/localtime \
etc/motd etc/passwd etc/printcap etc/services \
etc/protocols
+ADD_DIRS= usr/X11R6/share usr/X11R6/man usr/X11R6/lib/tls \
+ usr/X11R6/include usr/X11R6/bin
ADD_FILES= #empty
.if (${MACHINE_ARCH} == "amd64")
@@ -148,6 +151,9 @@ do-build:
@for F in ${REMOVE_FILES}; do \
${RM} -f ${WRKSRC}/$$F; \
done
+ @for F in ${ADD_DIRS}; do \
+ ${MKDIR} -p ${WRKSRC}/$$F; \
+ done
@for F in ${ADD_FILES}; do \
${TOUCH} ${WRKSRC}/$$F; \
done
diff --git a/emulators/linux_base-fc7/pkg-descr b/emulators/linux_base-fc7/pkg-descr
index 91e5c58f6fd3..c9b4a96781f4 100644
--- a/emulators/linux_base-fc7/pkg-descr
+++ b/emulators/linux_base-fc7/pkg-descr
@@ -1,5 +1,5 @@
This port contains packages from a near-minimal installation of Fedora Core
-Linux 6. These packages, in conjunction with the linux kernel module,
+Linux 7. These packages, in conjunction with the linux kernel module,
form the basis of the Linux compatibility environment. It is designed to
provide a nice user experience by using the FreeBSD configuration for
corresponding Linux stuff where possible. Because of this any work which
diff --git a/emulators/linux_base-fc7/pkg-plist b/emulators/linux_base-fc7/pkg-plist
index b7ab9534ca4f..74b747345c3c 100644
--- a/emulators/linux_base-fc7/pkg-plist
+++ b/emulators/linux_base-fc7/pkg-plist
@@ -4958,6 +4958,11 @@ var/mail
@exec /bin/mkdir -p %D/usr/lib/X11
@exec /bin/mkdir -p %D/usr/games
@exec /bin/mkdir -p %D/usr/etc
+@exec /bin/mkdir -p %D/usr/X11R6/share
+@exec /bin/mkdir -p %D/usr/X11R6/man
+@exec /bin/mkdir -p %D/usr/X11R6/lib/tls
+@exec /bin/mkdir -p %D/usr/X11R6/include
+@exec /bin/mkdir -p %D/usr/X11R6/bin
@exec /bin/mkdir -p %D/sys
@exec /bin/mkdir -p %D/srv
@exec /bin/mkdir -p %D/selinux
@@ -5497,7 +5502,7 @@ var/mail
@dirrm sys
@dirrm srv
@dirrm selinux
-@dirrm proc
+@dirrmtry proc
@dirrm opt
@dirrm mnt
@dirrm media
@@ -6305,6 +6310,13 @@ var/mail
@dirrm usr/include/db4.2.52
@dirrm usr/include
@dirrm usr/bin
+@dirrm usr/X11R6/share
+@dirrm usr/X11R6/man
+@dirrm usr/X11R6/lib/tls
+@dirrm usr/X11R6/lib
+@dirrm usr/X11R6/include
+@dirrm usr/X11R6/bin
+@dirrm usr/X11R6
@dirrm usr
@dirrm sbin
@dirrm lib/terminfo/x