Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 5c9fc8b + 4ceb51a commit 31b542d41e2cdbd00771f8fd3dd1360afb3589e5 git committed Nov 18, 2013
View
1 build-files/conf/installcd-prunelist
@@ -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
View
186 build-files/ports-overlay/Mk/bsd.linux-rpm.mk
@@ -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
View
3 build-files/ports-overlay/graphics/linux-c6-cairo/Makefile
@@ -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>
View
3 build-files/ports-overlay/security/linux-c6-openssl-compat/Makefile
@@ -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>
View
2 build-files/ports-overlay/www/linux-c6-flashplugin11/Makefile
@@ -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
View
1 build-files/ports-overlay/www/linux-c6-qt47-webkit/pkg-plist
@@ -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
View
1 src-qt4/PCDM/src/pcdm-xprocess.cpp
@@ -174,6 +174,7 @@ void XProcess::setupSessionEnvironment(){
environ.insert("USER",xuser); // Username
environ.insert("PATH",environ.value("PATH")+":"+xhome+"/bin"); // Append the user's home dir to the path
environ.insert("LANG",langCode); //Set the proper localized language
+ environ.insert("LC_ALL",langCode); //additional localization variable for some DE's
environ.insert("MAIL","/var/mail/"+xuser); //Set the mail variable
environ.insert("GROUP",xuser); //Set the proper group id
environ.insert("SHLVL","0"); //Set the proper shell level
View
117 src-qt4/pc-installgui/i18n/SysInstaller_fi.ts
@@ -13,15 +13,15 @@
</message>
<message>
<source>&amp;Back</source>
- <translation>&amp;Takaisin</translation>
+ <translation>&amp;Edellinen</translation>
</message>
<message>
<source>&amp;Next</source>
<translation>&amp;Seuraava</translation>
</message>
<message>
<source>Welcome to PC-BSD! Please select your language and click next to continue.</source>
- <translation>Tervetuloa PC-BSD:n pariin. Valitse kielesi ja paina Seuraava jatkaaksesi.</translation>
+ <translation>Tervetuloa PC-BSD:n pariin. Valitse asennuskieli ja paina Seuraava jatkaaksesi.</translation>
</message>
<message>
<source>&amp;Customize</source>
@@ -77,7 +77,7 @@
</message>
<message>
<source>Mount:</source>
- <translation>Liitospiste:</translation>
+ <translation>Liitos:</translation>
</message>
<message>
<source>The following meta-pkgs will be installed:</source>
@@ -133,13 +133,11 @@
</message>
<message>
<source>Display hardware compatibility diagnostic</source>
- <translation type="unfinished">
- </translation>
+ <translation>Näytä laitteiston yhteensopivuus diagnostiikka</translation>
</message>
<message>
<source>System Selection</source>
- <translation type="unfinished">
- </translation>
+ <translation>Järjestelmän valinta</translation>
</message>
<message>
<source>Installing packages... This may take a while...</source>
@@ -158,8 +156,7 @@
</message>
<message>
<source>Display help for the current screen</source>
- <translation type="unfinished">
- </translation>
+ <translation>Näytä tämän näkymän ohjeet</translation>
</message>
<message>
<source>Launch the on-screen keyboard</source>
@@ -358,18 +355,15 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
<name>QObject</name>
<message>
<source>This screen allows you to select the language you wish to perform the install with.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Tässä näkymässä voit valita asennusohjelmassa käytetyn kielen.</translation>
</message>
<message>
<source>This screen allows you to select the type of system you wish to install. Clicking customize will allow you to change the selected packages for your system.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Tässä näkymässä voit valita minkä tyyppisen järjestelmän asennat. Painamalla Muokkaa, voit muokata asennettavia paketteja vielä tarkemmin.</translation>
</message>
<message>
<source>This screen will display the currently selected disk options. Clicking customize will allow you to change the target disk, file-systems and more.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Tässä näymässä näet miten järjestelmä asennetaan levylle. Painamalla Muokkaa, voit muokata levyä, jolle asennus tehdään, tiedostojärjestelmää ja muitakin asetuksia.</translation>
</message>
<message>
<source>Your system is now installing! Go grab a cup of coffee and relax, the installer will notify you when it is finished.</source>
@@ -510,137 +504,112 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
<name>dialogHelp</name>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Sulje</translation>
</message>
</context>
<context>
<name>dialogInfoBox</name>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Sulje</translation>
</message>
</context>
<context>
<name>widgetKeyboard</name>
<message>
<source>Keyboard Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>Näppäimistön asetukset</translation>
</message>
<message>
<source>Key Layout</source>
- <translation type="unfinished">
- </translation>
+ <translation>Näppäinasettelu</translation>
</message>
<message>
<source>Variant</source>
- <translation type="unfinished">
- </translation>
+ <translation>Muunnos</translation>
</message>
<message>
<source>Keyboard Model</source>
- <translation type="unfinished">
- </translation>
+ <translation>Näppäimistön malli</translation>
</message>
<message>
<source>( you may type into the space below to test your selected settings. )</source>
- <translation type="unfinished">
- </translation>
+ <translation>( voit kirjoittaa alla olevaan tilaan testataksesi asetusia )</translation>
</message>
<message>
<source>&amp;Apply</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Käytä</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Sulje</translation>
</message>
</context>
<context>
<name>wizardDisk</name>
<message>
<source>This wizard will walk you through the disk setup process. Please choose the setup mode you wish to use.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Tämä avustaja kuljettaa sinut levyn asetusten valintaprosessin läpi. Ole hyvä, ja valitse missä moodissa haluat avustajan toimivan.</translation>
</message>
<message>
<source>Setup Mode</source>
- <translation type="unfinished">
- </translation>
+ <translation>Asennus moodi</translation>
</message>
<message>
<source>Basic (New to BSD or disk partitioning)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Perus (Uusi BSD:n käyttäjä tai levyn partitioimisessa)</translation>
</message>
<message>
<source>Advanced (Experienced with file-systems)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Edistynyt (Tiedostojärjestelmät ovat tuttuja)</translation>
</message>
<message>
<source>FreeBSD Experts (CLI manual mode)</source>
- <translation type="unfinished">
- </translation>
+ <translation>FreeBSD expertti (Komentoriviä käyttäen)</translation>
</message>
<message>
<source>Selected Disk</source>
- <translation type="unfinished">
- </translation>
+ <translation>Valitty levy</translation>
</message>
<message>
<source>Selected Partition</source>
- <translation type="unfinished">
- </translation>
+ <translation>Valittu partitio</translation>
</message>
<message>
<source>Partition disk with GPT</source>
- <translation type="unfinished">
- </translation>
+ <translation>Tee GPT paritiointi</translation>
</message>
<message>
<source>Below you may adjust the file-system mount points. For most users the defaults will work best. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Alla voit muokata tiedostojärjestelmän liitospisteitä. Useimmille käyttäjille oletusasetukset toimivat parhaiten.</translation>
</message>
<message>
<source>&amp;Add</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Lisää</translation>
</message>
<message>
<source>&amp;Remove</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Poista</translation>
</message>
<message>
<source>You have chosen Expert mode. In this mode you are able to launch a terminal window and use the command-line to manually partition your disk. When you are finished, make sure to mount your filesystems to /mnt to begin the installation. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Olet valinnut experteille suunnatun käyttötilan. Tässä käyttötilassa voit käynnistää komentorivin ja antaa partitointikomennot käsin. Kun olet valmis, varmista että olet liittänyt tiedostojärjestelmän liitospisteeseen /mnt ennen asennuksen aloittamista.</translation>
</message>
<message>
<source>&amp;Launch terminal</source>
- <translation type="unfinished">
- </translation>
+ <translation>&amp;Käynnistä komentorivi</translation>
</message>
<message>
<source>Please check the disk summary below and click finish to save your settings. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Ole hyvä, ja tarkista alla oleva levyn yhteenveto. Paina Lopeta tallentaaksesi asetukset.</translation>
</message>
<message>
<source>Use entire disk</source>
- <translation type="unfinished">
- </translation>
+ <translation>Käytä levy kokonaan</translation>
</message>
<message>
<source>ZFS Mounts</source>
- <translation type="unfinished">
- </translation>
+ <translation>ZFS Liitokset</translation>
</message>
<message>
<source>ZFS Options</source>
@@ -649,33 +618,27 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Resizing</source>
- <translation type="unfinished">
- </translation>
+ <translation>Muokkaa kokoa</translation>
</message>
<message>
<source>Remove mount-point</source>
- <translation type="unfinished">
- </translation>
+ <translation>Poista liitospiste</translation>
</message>
<message>
<source>Are you sure you want to remove this mount point?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Oletko varma, että haluat poistaa tämän liitospisteen?</translation>
</message>
<message>
<source>Enter mount-point</source>
- <translation type="unfinished">
- </translation>
+ <translation>Kirjoita liitospiste</translation>
</message>
<message>
<source>Please enter the new mount-point:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Ole hyvä, ja kirjoita uusi liitospiste:</translation>
</message>
<message>
<source>Editing:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Muokkaa:</translation>
</message>
<message>
<source>Installing to file-system mounted at /mnt</source>
View
1 src-qt4/port-files/pkg-plist
@@ -2691,7 +2691,6 @@ share/applications/softmanager.desktop
share/applications/pcbsdpbu.desktop
share/applications/pc-pkgmanager.desktop
share/applications/pc-updategui.desktop
-share/applications/pcgdmconf.desktop
share/applications/pc-welcome.desktop
share/applications/warden.desktop
share/applications/EasyPBI.desktop
View
4 src-qt4/xtrafiles/local/bin/flashpluginctl
@@ -16,7 +16,7 @@ usage_func() {
exit
}
-check_file "/usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so" "www/linux-f10-flashplugin10"
+check_file "/usr/local/lib/browser_plugins/libflashplayer.so" "www/linux-f10-flashplugin10"
check_file "/usr/local/bin/nspluginwrapper" "www/nspluginwrapper"
if [ $# -ne 1 ]; then
@@ -38,7 +38,7 @@ case $1 in
fi
kldload linux
fi
- nspluginwrapper -i /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so
+ nspluginwrapper -i /usr/local/lib/browser_plugins/libflashplayer.so
printf "\nFlash Plugin for user '`whoami`' enabled\n\n"
;;
View
4 src-sh/pbi-manager10/pbi-manager
@@ -3160,10 +3160,10 @@ load_info_from_dir() {
PBI_ICONURL="`cat ${1}/pbi_iconurl`"
fi
if [ -e "${1}/pbi_desc" ] ; then
- PBI_DESC="`cat ${1}/pbi_desc | awk 1 ORS='<br>' | sed 's|*|-|g'`"
+ PBI_DESC="`cat ${1}/pbi_desc | awk 1 ORS=' ' | sed 's| |<br>|g' | sed 's|*|-|g'`"
fi
if [ -e "${1}/pbi_shortdesc" ] ; then
- PBI_SHORTDESC="`cat ${1}/pbi_shortdesc | awk 1 ORS='<br>' | sed 's|*|-|g'`"
+ PBI_SHORTDESC="`cat ${1}/pbi_shortdesc | awk 1 ORS=' ' | sed 's| |<br>|g' | sed 's|*|-|g'`"
fi
if [ -e "${1}/pbi_maintainer" ] ; then
PBI_MAINTAINER="`cat ${1}/pbi_maintainer`"
View
3 src-sh/pc-extractoverlay/prune-port-files
@@ -17,3 +17,6 @@
# Remove old xsessions
/usr/local/share/xsessions/[a-zA-Z]*.desktop
+
+# Remove font link which causes weird AA issues
+/usr/local/etc/fonts/conf.d/85-wqy.conf
View
4 src-sh/pc-metapkgmanager/pc-metapkgmanager
@@ -78,7 +78,7 @@ add_metapkgs() {
download_cache_packages "pkg-static install -U -n $pkgName"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "install -U -F -y $pkgName"
+ check_pkg_conflicts "install -FUy $pkgName"
if [ $? -ne 0 ] ; then
exit 1
fi
@@ -307,7 +307,7 @@ intercept_pkg_dl()
download_cache_packages "pkg $op $flags"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
+ check_pkg_conflicts "${op} -FUy $flags"
if [ $? -ne 0 ] ; then
exit 1
fi
View
2 src-sh/pc-updatemanager/pc-updatemanager
@@ -589,7 +589,7 @@ update_pkgs()
download_cache_packages "pkg-static upgrade -U -n $1"
fi
- check_pkg_conflicts "upgrade -U -F -y $1"
+ check_pkg_conflicts "upgrade -FUy $1"
if [ $? -ne 0 ] ; then
exit 1
fi
View
27 src-sh/xtrafiles/local/share/pcbsd/bin/pkg
@@ -38,33 +38,8 @@ intercept_pkg_dl()
fullopts="$@"
op="$1"
- # Make sure we insert some flags we need
- while [ $# -gt 0 ]; do
- if [ $count -gt 0 ] ; then
- # If we are already using -n, we can skip downloading anything
- if [ "$1" = "-n" ] ; then
- pkg $fullopts
- exit $?
- fi
- flags="$flags $1"
- else
- flags="-U -n"
- fi
- count=`expr $count + 1`
- shift
- done
-
- # Lets pre-download all packages
- download_cache_packages "pkg $op $flags"
-
- # Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
- if [ $? -ne 0 ] ; then
- exit 1
- fi
-
# Time to run pkgng and let it do its thing
- pkg $fullopts
+ pkg-static $fullopts
result=$?
# Nobody likes a litter bug

0 comments on commit 31b542d

Please sign in to comment.
Something went wrong with that request. Please try again.