Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents e6c1b6c + cee96a1 commit 922329ddcd48a088da6483555b5854892127cf0b Ken Moore committed Nov 20, 2013
Showing with 693 additions and 675 deletions.
  1. +1 −0 build-files/conf/installcd-prunelist
  2. +186 −0 build-files/ports-overlay/Mk/bsd.linux-rpm.mk
  3. +1 −2 build-files/ports-overlay/graphics/linux-c6-cairo/Makefile
  4. +22 −0 build-files/ports-overlay/misc/pcbsd-meta-cinnamon/Makefile
  5. +3 −0 build-files/ports-overlay/misc/pcbsd-meta-cinnamon/pkg-descr
  6. +22 −0 build-files/ports-overlay/misc/pcbsd-meta-gnome3/Makefile
  7. +3 −0 build-files/ports-overlay/misc/pcbsd-meta-gnome3/pkg-descr
  8. +33 −0 build-files/ports-overlay/misc/pcbsd-meta-mate/Makefile
  9. +3 −0 build-files/ports-overlay/misc/pcbsd-meta-mate/pkg-descr
  10. +1 −2 build-files/ports-overlay/security/linux-c6-openssl-compat/Makefile
  11. +1 −1 build-files/ports-overlay/www/linux-c6-flashplugin11/Makefile
  12. +0 −1 build-files/ports-overlay/www/linux-c6-qt47-webkit/pkg-plist
  13. +38 −74 src-qt4/EasyPBI/i18n/EasyPBI_ko.ts
  14. +43 −86 src-qt4/PCDM/i18n/PCDM_lv.ts
  15. +9 −13 src-qt4/about-gui/i18n/AboutGui_ko.ts
  16. +2 −3 src-qt4/about-gui/i18n/AboutGui_lv.ts
  17. +35 −68 src-qt4/libpcbsd/ui/i18n/libpcbsd_lv.ts
  18. +26 −26 src-qt4/pc-adsldap/i18n/PCADSLDAP_ko.ts
  19. +7 −14 src-qt4/pc-bluetoothtray/i18n/pc-bluetoothtray_ko.ts
  20. +2 −0 src-qt4/pc-bugreport/pcbugreport.desktop
  21. +1 −0 src-qt4/pc-controlpanel/items/hardware/pc-bluetoothmanager.desktop
  22. +2 −0 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
  23. +1 −0 src-qt4/pc-controlpanel/items/software/pc-pkgmanager.desktop
  24. +1 −0 src-qt4/pc-controlpanel/items/system/pc-adsldap.desktop
  25. +2 −0 src-qt4/pc-controlpanel/items/system/pc-bootconfig.desktop
  26. +1 −0 src-qt4/pc-controlpanel/items/system/pc-dmconf.desktop
  27. +1 −0 src-qt4/pc-controlpanel/items/tools/pbi-luckybackup.desktop
  28. +2 −0 src-qt4/pc-controlpanel/items/tools/pcbugreport.desktop
  29. +24 −24 src-qt4/pc-dmconf/i18n/pc-dmconf_ko.ts
  30. +1 −0 src-qt4/pc-dmconf/pc-dmconf.desktop
  31. +5 −8 src-qt4/pc-firstbootgui/i18n/FirstBoot_lv.ts
  32. +8 −8 src-qt4/pc-installgui/i18n/SysInstaller_ko.ts
  33. +1 −1 src-qt4/pc-netmanager/src/ethernetconfig/i18n/ethernetconfig_ko.ts
  34. +6 −6 src-qt4/pc-pbigui/i18n/PBI_ko.ts
  35. +1 −0 src-qt4/pc-pkgmanager/pc-pkgmanager.desktop
  36. +2 −4 src-qt4/pc-servicemanager/i18n/ServiceManager_lv.ts
  37. +118 −215 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
  38. +6 −12 src-qt4/pc-soundconfig/i18n/SoundConfig_ko.ts
  39. +1 −1 src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_ko.ts
  40. +6 −12 src-qt4/pc-updategui/i18n/UpdateGui_ko.ts
  41. +7 −9 src-qt4/pc-usermanager/i18n/pcbsdusermanager_lv.ts
  42. +3 −6 src-qt4/pc-xgui/i18n/XGUISource_lv.ts
  43. +2 −4 src-qt4/pc-zmanager/i18n/ZManager_ko.ts
  44. +0 −1 src-qt4/port-files/pkg-plist
  45. +2 −2 src-qt4/xtrafiles/local/bin/flashpluginctl
  46. +2 −2 src-sh/pbi-manager10/pbi-manager
  47. +0 −10 src-sh/pc-extractoverlay/desktop-overlay/boot/loader.conf.pcbsd
  48. +3 −0 src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.cshrc
  49. +2 −0 src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/dot.profile
  50. +25 −23 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/virtualbox.desktop
  51. +1 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/32Cinnamon.desktop
  52. +2 −1 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/33Cinnamon2d.desktop
  53. +3 −0 src-sh/pc-extractoverlay/prune-port-files
  54. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/Cinnamon/desktop
  55. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Cinnamon/pkg-desc
  56. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/Cinnamon/pkg-icon.png
  57. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Cinnamon/pkg-parent
  58. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Cinnamon/ports-list
  59. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/GNOME3/desktop
  60. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/GNOME3/pkg-desc
  61. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/GNOME3/pkg-icon.png
  62. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/GNOME3/pkg-parent
  63. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/GNOME3/ports-list
  64. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/desktop
  65. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/pkg-desc
  66. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/pkg-icon.png
  67. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/pkg-parent
  68. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/Mate/ports-list
  69. +2 −2 src-sh/pc-metapkgmanager/pc-metapkgmanager
  70. +1 −1 src-sh/pc-updatemanager/pc-updatemanager
  71. +1 −33 src-sh/xtrafiles/local/share/pcbsd/bin/pkg
@@ -433,3 +433,4 @@ usr/local/bin/pc-user*
usr/local/bin/pc-wel*
usr/local/bin/pc-x*
usr/local/sbin/pbi*
+usr/local/etc/fonts/conf.d/85-wqy.conf
@@ -0,0 +1,186 @@
+#-*- tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD: Mk/bsd.linux-rpm.mk 329540 2013-10-06 09:08:22Z antoine $
+#
+
+# Variables:
+# LINUX_DIST - Will be used to set some dist-specific presets.
+# Valid values: fedora
+# LINUX_DIST_VER - Use depends upon the dist-specific presets.
+# Valid values for "fedora": all version numbers
+# e.g. 10 for fedora 10
+# This is used to set MASTER_SITE_{,SRC_}SUBDIR
+# if it isn't already set.
+# MASTER_SITE_SRC_SUBDIR
+# - The subdir for the src RPM's.
+# DISTFILES - For simple cases this will be set automatically
+# based upon the DISTNAME.
+# SRC_DISTFILES - Variable which contains the corresponding src RPM's.
+# If there's no corresponding src RPM, it has to be
+# set to the empty value (SRC_DISTFILES= "").
+# AUTOMATIC_PLIST - Generate a dynamic plist (please have a look at the
+# porters handbook section which talks about plists.
+# This feature is reserved for rare cases).
+# BRANDELF_DIRS - A list of directories with executables to brand
+# as a linux executable. The directories has to not
+# contain libraries.
+# BRANDELF_FILES - A list of files to brand as a linux executable in
+# case BRANDELF_DIRS can't be used.
+
+.if !defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Pre_Include)
+
+Linux_RPM_Include_MAINTAINER= emulation@FreeBSD.org
+Linux_RPM_Pre_Include= bsd.linux-rpm.mk
+
+EXTRACT_SUFX?= .${LINUX_RPM_ARCH}.rpm
+SRC_SUFX?= .src.rpm
+
+USE_LINUX?= yes
+USE_LINUX_PREFIX= yes
+
+NO_WRKSUBDIR= yes
+NO_BUILD= yes
+
+. if ${ARCH} == "amd64"
+LINUX_RPM_ARCH?= i386 # the linuxulator does not yet support amd64 code
+. elif ${ARCH} == "powerpc"
+LINUX_RPM_ARCH?= ppc
+. else
+LINUX_RPM_ARCH?= ${ARCH}
+. endif
+
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include)
+
+Linux_RPM_Post_Include= bsd.linux-rpm.mk
+
+LINUX_DIST?= fedora
+LINUX_DIST_VER?= 10
+. if !defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
+ ${LINUX_DIST_VER} != 10
+IGNORE= bsd.linux-rpm.mk test failed: default package building at OSVERSION>=800076 was changed to linux-f10 ports, please define OVERRIDE_LINUX_NONBASE_PORTS to build other linux infrastructure ports
+. endif
+
+# linux Fedora 10 infrastructure ports should be used with compat.linux.osrelease=2.6.16,
+# linux_base-f10 (or greater) port
+. if ${LINUX_DIST_VER} == 10
+# let's check for apropriate compat.linux.osrelease
+. if (${LINUX_OSRELEASE} != "2.6.16")
+IGNORE= bsd.linux-rpm.mk test failed: the port should be used with compat.linux.osrelease=2.6.16, which is supported by FreeBSD 8 and above
+. endif
+. endif
+
+. if defined(LINUX_DIST)
+DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
+
+. if ${LINUX_DIST} == "fedora"
+# we do not want to define MASTER_SITES and MASTER_SITE_* if they are already defined
+# ex.: MASTER_SITES=file:///...
+. ifndef MASTER_SITES
+MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
+. if ${LINUX_DIST_VER} == 10
+MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
+ ../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
+ ../updates/${LINUX_DIST_VER}/SRPMS
+. else
+MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
+ updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
+MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \
+ updates/${LINUX_DIST_VER}/SRPMS
+. endif
+. endif
+. else
+IGNORE= unknown LINUX_DIST in port Makefile
+. endif
+. endif
+PKGNAMEPREFIX?= linux-
+
+# DISTFILES and SRC_DISTFILES assume that there is only one bindist
+# and one src file.
+# Please, define them n the Makefile of the port in case this assumption
+# is not true.
+
+DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
+BIN_DISTFILES:= ${DISTFILES}
+SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX}
+EXTRACT_ONLY?= ${BIN_DISTFILES}
+
+#. if defined(PACKAGE_BUILDING)
+#DISTFILES+= ${SRC_DISTFILES}
+#MASTER_SITE_SUBDIR+= ${MASTER_SITE_SRC_SUBDIR}
+#ALWAYS_KEEP_DISTFILES= yes
+#. endif
+
+EXTRACT_CMD?= ${TAR}
+EXTRACT_BEFORE_ARGS?= -xf
+EXTRACT_AFTER_ARGS?=
+
+DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
+
+BRANDELF_DIRS?=
+BRANDELF_FILES?=
+
+# For ports that define PORTDOCS, be sure not to install
+# documentation if NOPORTDOCS is defined
+. if defined(PORTDOCS) && defined(NOPORTDOCS)
+pre-patch: linux-rpm-clean-portdocs
+
+. if !target(linux-rpm-clean-portdocs)
+linux-rpm-clean-portdocs:
+. for x in ${PORTDOCS}
+ @${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x}
+. endfor
+ @${RMDIR} ${WRKDIR}/${DOCSDIR_REL}
+. endif
+. endif
+
+. if defined(AUTOMATIC_PLIST)
+
+. if ${USE_LINUX} == "f10" || ${USE_LINUX:L} == "yes"
+_LINUX_BASE_SUFFIX= f10
+. else
+# other linux_base ports do not provide a pkg-plist file
+IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\" and \"f10\"
+. endif
+
+PLIST?= ${WRKDIR}/.PLIST.linux-rpm
+
+pre-install: linux-rpm-generate-plist
+
+. if !target(linux-rpm-generate-plist)
+linux-rpm-generate-plist:
+ cd ${WRKSRC} && \
+ ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \
+ ${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs
+ @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs
+ @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST}
+. endif
+. endif
+
+. if !target(do-install)
+do-install:
+. if ${BRANDELF_DIRS}
+ @cd ${WRKSRC} && ${FIND} ${BRANDELF_DIRS} -type f -print0 \
+ | ${XARGS} -0 ${FILE} | ${GREP} ELF | ${CUT} -d : -f 1 \
+ | ${XARGS} ${BRANDELF} -t Linux
+. endif
+. if ${BRANDELF_FILES}
+ @cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES}
+. endif
+ cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
+ cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
+. endif
+
+. if !target(new-plist)
+new-plist: build
+ @${RM} -f ${PLIST}.new
+ @cd ${WRKSRC} && \
+ ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}.new; \
+ ${FIND} -d * ! -path "stage*" -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \
+ done
+. endif
+
+.endif
@@ -28,7 +28,6 @@ PLIST_FILES= usr/lib/libcairo.so.2 \
usr/lib/libcairo.so.2.10800.8
DOCSDIR= ${PREFIX}/usr/share/doc/cairo-${PORTVERSION}
PORTDOCS= AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 \
- COPYING-MPL-1.1 ChangeLog NEWS PORTING_GUIDE README
+ COPYING-MPL-1.1 NEWS README
-NO_STAGE= yes
.include <bsd.port.mk>
@@ -0,0 +1,22 @@
+# New ports collection makefile for: pcbsd-meta-cinnamon
+#
+# $FreeBSD$
+#
+
+PORTNAME= pcbsd-meta-cinnamon
+PORTVERSION= CHGVERSION
+CATEGORIES= misc
+MASTER_SITES= # empty
+DISTFILES= # none
+
+MAINTAINER= kris@pcbsd.org
+COMMENT= The meta-port pcbsd-meta-cinnamon
+
+RUN_DEPENDS= cinnamon>=0:${PORTSDIR}/x11/cinnamon
+
+NO_BUILD= yes
+
+do-install:
+ ${DO_NADA}
+
+.include <bsd.port.mk>
@@ -0,0 +1,3 @@
+The meta-port for PC-BSD meta-pkg cinnamon
+
+WWW: http://www.pcbsd.org
@@ -0,0 +1,22 @@
+# New ports collection makefile for: pcbsd-meta-gnome3
+#
+# $FreeBSD$
+#
+
+PORTNAME= pcbsd-meta-gnome3
+PORTVERSION= CHGVERSION
+CATEGORIES= misc
+MASTER_SITES= # empty
+DISTFILES= # none
+
+MAINTAINER= kris@pcbsd.org
+COMMENT= The meta-port pcbsd-meta-gnome3
+
+RUN_DEPENDS= gnome3>=0:${PORTSDIR}/x11/gnome3
+
+NO_BUILD= yes
+
+do-install:
+ ${DO_NADA}
+
+.include <bsd.port.mk>
@@ -0,0 +1,3 @@
+The meta-port for PC-BSD meta-pkg gnome3
+
+WWW: http://www.pcbsd.org
@@ -0,0 +1,33 @@
+# New ports collection makefile for: pcbsd-meta-mate
+#
+# $FreeBSD$
+#
+
+PORTNAME= pcbsd-meta-mate
+PORTVERSION= CHGVERSION
+CATEGORIES= misc
+MASTER_SITES= # empty
+DISTFILES= # none
+
+MAINTAINER= kris@pcbsd.org
+COMMENT= The meta-port pcbsd-meta-mate
+
+RUN_DEPENDS= mate-base>=0:${PORTSDIR}/x11/mate-base \
+ mate-themes>=0:${PORTSDIR}/x11-themes/mate-themes \
+ mate-icon-theme-faenza>=0:${PORTSDIR}/x11-themes/mate-icon-theme-faenza \
+ mate-terminal>=0:${PORTSDIR}/x11/mate-terminal \
+ mate-system-monitor>=0:${PORTSDIR}/sysutils/mate-system-monitor \
+ eom>=0:${PORTSDIR}/graphics/mate-image-viewer \
+ engrampa>=0:${PORTSDIR}/archivers/mate-file-archiver \
+ atril>=0:${PORTSDIR}/graphics/mate-document-viewer \
+ mate-volume-control>=0:${PORTSDIR}/audio/mate-media \
+ mate-power-manager>=0:${PORTSDIR}/sysutils/mate-power-manager \
+ mozo>=0:${PORTSDIR}/deskutils/mate-menu-editor \
+ mate-calc>=0:${PORTSDIR}/math/mate-calc \
+ mate-applets>=0:${PORTSDIR}/x11/mate-applets
+NO_BUILD= yes
+
+do-install:
+ ${DO_NADA}
+
+.include <bsd.port.mk>
@@ -0,0 +1,3 @@
+The meta-port for PC-BSD meta-pkg mate
+
+WWW: http://www.pcbsd.org
@@ -26,8 +26,7 @@ USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
DESCR= ${.CURDIR}/../openssl/pkg-descr
-NO_STAGE= yes
post-install:
- @cd ${PREFIX}/usr/lib && ${LN} -sf libssl.so.6 libssl.so.7
+ ${LN} -sf libssl.so.6 ${STAGEDIR}${PREFIX}/usr/lib/libssl.so.7
.include <bsd.port.mk>
@@ -16,7 +16,7 @@ MAINTAINER= eadler@FreeBSD.org
COMMENT= Adobe Flash Player NPAPI Plugin
ONLY_FOR_ARCHS= amd64 i386
-USE_LINUX_APPS= openssl nspr nss gtk2 alsalib curl
+USE_LINUX_APPS= openssl nspr nss gtk2 alsalib curl cyrus-sasl2
WANT_GNOME= yes
RESTRICTED= Redistribution not allowed
@@ -3,7 +3,6 @@ usr/lib/qt47/libQtWebKit.so.4
usr/lib/qt47/libQtWebKit.so.4.7
usr/lib/qt47/libQtWebKit.so.4.7.2
usr/lib/qt47/plugins/designer/libqwebview.so
-@dirrm usr/lib/qt47/imports/QtWebKit/qmldir
@dirrm usr/lib/qt47/imports/QtWebKit
@dirrmtry usr/lib/qt47/plugins/designer
@dirrmtry usr/lib/qt47/plugins
Oops, something went wrong.

0 comments on commit 922329d

Please sign in to comment.