From 369eb054b0edf196641e8706f3f6fcd77788f690 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 21:55:51 +0000 Subject: Qt4 deprecation: Remove Qt4 and its consumes. 2019-03-15 accessibility/qt4-accessible: Qt4 has been EOL since december 2015 2019-03-15 astro/qlandkartegt: Qt4 has been EOL since december 2015 2019-03-15 astro/stellarium-qt4: Qt4 has been EOL since december 2015 2019-03-15 astro/xglobe: Qt4 has been EOL since december 2015 2019-03-15 audio/acoustid-fingerprinter: Qt4 has been EOL since december 2015 2019-03-15 audio/cueplayer: Qt4 has been EOL since december 2015 2019-03-15 audio/esperanza: Qt4 has been EOL since december 2015 2019-03-15 audio/lastfm-desktop: Qt4 has been EOL since december 2015 2019-03-15 audio/minitunes: Qt4 has been EOL since december 2015 2019-03-15 audio/mixxx20: Qt4 has been EOL since december 2015 2019-03-15 audio/mumble: Qt4 has been EOL since december 2015 2019-03-15 audio/murmur: Qt4 has been EOL since december 2015 2019-03-15 audio/puddletag: Qt4 has been EOL since december 2015 2019-03-15 audio/qmpdclient: Qt4 has been EOL since december 2015 2019-03-15 audio/skype-call-recorder: Qt4 has been EOL since december 2015 2019-03-15 audio/virtual_oss_ctl: Qt4 has been EOL since december 2015 2019-03-15 biology/clustalx: Qt4 has been EOL since december 2015 2019-03-15 cad/klayout: Qt4 has been EOL since december 2015 2019-03-15 cad/layouteditor: Qt4 has been EOL since december 2015 2019-03-15 cad/leocad: Qt4 has been EOL since december 2015 2019-03-15 cad/meshlab: Qt4 has been EOL since december 2015 2019-03-15 cad/qfsm: Qt4 has been EOL since december 2015 2019-03-15 cad/qucs: Qt4 has been EOL since december 2015 2019-03-15 chinese/gcin-qt4: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-cn: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-tw: Qt4 has been EOL since december 2015 2019-03-15 chinese/qterm: Qt4 has been EOL since december 2015 2019-03-15 comms/dabstick-radio: Qt4 has been EOL since december 2015 2019-03-15 comms/hamfax: Qt4 has been EOL since december 2015 2019-03-15 comms/linpsk: Qt4 has been EOL since december 2015 2019-03-15 databases/py-qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-ibase-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-mysql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-odbc-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-pgsql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite3-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/sqliteman: Qt4 has been EOL since december 2015 2019-03-15 databases/tora: Qt4 has been EOL since december 2015 2019-03-15 deskutils/cdcat: Qt4 has been EOL since december 2015 2019-03-15 deskutils/fbreader: Qt4 has been EOL since december 2015 2019-03-15 deskutils/launchy: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qorganizer: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qrfcview: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qtm: Qt4 has been EOL since december 2015 2019-03-15 deskutils/tuxcards: Qt4 has been EOL since december 2015 2019-03-15 deskutils/vym: Qt4 has been EOL since december 2015 2019-03-15 devel/apiextractor: Qt4 has been EOL since december 2015 2019-03-15 devel/automoc4: Qt4 has been EOL since december 2015 2019-03-15 devel/edb: Qt4 has been EOL since december 2015 2019-03-15 devel/generatorrunner: Qt4 has been EOL since december 2015 2019-03-15 devel/grantlee: Qt4 has been EOL since december 2015 2019-03-15 devel/gwenhywfar-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/kaptain: Qt4 has been EOL since december 2015 2019-03-15 devel/ninja-ide: Qt4 has been EOL since december 2015 2019-03-12 devel/physfs-devel: is the same as devel/physfs, serving no purpose 2019-03-15 devel/piklab: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-core: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbussupport: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-help: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-test: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qbzr: Qt4 has been EOL since december 2015 2019-03-15 devel/qct: Qt4 has been EOL since december 2015 2019-03-15 devel/qdevelop: Qt4 has been EOL since december 2015 2019-03-15 devel/qprog: Qt4 has been EOL since december 2015 2019-03-15 devel/qross: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant-adp: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-corelib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-help-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-libqtassistantclient: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguist: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguisttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-makeqpf: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-moc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-porting: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdbusviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdoc3: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmake: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmlviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qt3support: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-singleapplication: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-soap: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qvfb: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-rcc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-testlib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic3: Qt4 has been EOL since december 2015 2019-03-15 devel/qtscriptgenerator: Qt4 has been EOL since december 2015 2019-03-15 devel/shiboken: Qt4 has been EOL since december 2015 2019-03-15 devel/subcommander2: Qt4 has been EOL since december 2015 2019-03-15 devel/universalindentgui: Qt4 has been EOL since december 2015 2019-03-15 editors/leo: Qt4 has been EOL since december 2015 2019-03-15 editors/lfhex: Qt4 has been EOL since december 2015 2019-03-15 editors/plume-creator-devel: Qt4 has been EOL since december 2015 2019-03-15 editors/textroom: Qt4 has been EOL since december 2015 2019-03-15 editors/yzis: Qt4 has been EOL since december 2015 2019-03-15 emulators/dboxfe: Qt4 has been EOL since december 2015 2019-03-15 emulators/q4wine: Qt4 has been EOL since december 2015 2019-03-15 emulators/qtemu: Qt4 has been EOL since december 2015 2019-03-15 emulators/swine: Qt4 has been EOL since december 2015 2019-03-15 finance/alkimia-qt4: Qt4 has been EOL since december 2015 2019-03-15 finance/bitcoin-armory: Qt4 has been EOL since december 2015 2019-03-15 finance/qhacc: Qt4 has been EOL since december 2015 2019-03-15 ftp/scythia: Qt4 has been EOL since december 2015 2019-03-15 games/bubble-chains: Qt4 has been EOL since december 2015 2019-03-15 games/capicity: Qt4 has been EOL since december 2015 2019-03-15 games/capitalism: Qt4 has been EOL since december 2015 2019-03-15 games/flukz: Qt4 has been EOL since december 2015 2019-03-15 games/goldencheetah: Qt4 has been EOL since december 2015 2019-03-15 games/jag: Qt4 has been EOL since december 2015 2019-03-15 games/kardsgt: Qt4 has been EOL since december 2015 2019-03-15 games/kcheckers: Qt4 has been EOL since december 2015 2019-03-15 games/openpref: Qt4 has been EOL since december 2015 2019-03-15 games/pokerth: Qt4 has been EOL since december 2015 2019-03-15 games/qgo: Qt4 has been EOL since december 2015 2019-03-15 games/qtads: Qt4 has been EOL since december 2015 2019-03-15 games/quackle: Qt4 has been EOL since december 2015 2019-03-15 games/spellathon: Qt4 has been EOL since december 2015 2019-03-15 games/sudoku-sensei: Qt4 has been EOL since december 2015 2019-03-15 games/tbe: Qt4 has been EOL since december 2015 2019-03-15 games/xptools: Qt4 has been EOL since december 2015 2019-03-15 german/tipp10: Qt4 has been EOL since december 2015 2019-03-15 graphics/appleseed: Qt4 has been EOL since december 2015 2019-03-15 graphics/aqsis: Qt4 has been EOL since december 2015 2019-03-15 graphics/autoq3d: Qt4 has been EOL since december 2015 2019-03-15 graphics/burplex: Qt4 has been EOL since december 2015 2019-03-15 graphics/darknock: Qt4 has been EOL since december 2015 2019-03-15 graphics/djview4-qt4: Qt4 has been EOL since december 2015 2019-03-15 graphics/easypaint: Qt4 has been EOL since december 2015 2019-03-15 graphics/eos-movrec: Qt4 has been EOL since december 2015 2019-03-15 graphics/gle-graphics: Qt4 has been EOL since december 2015 2019-03-15 graphics/lprof-devel: Qt4 has been EOL since december 2015 2019-03-15 graphics/luminance: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender14: Qt4 has been EOL since december 2015 2019-03-15 graphics/meshviewer: Qt4 has been EOL since december 2015 2019-03-15 graphics/natron: Qt4 has been EOL since december 2015 2019-03-15 graphics/oyranos: Qt4 has been EOL since december 2015 2019-03-15 graphics/pencil: Qt4 has been EOL since december 2015 2019-03-15 graphics/prison: Qt4 has been EOL since december 2015 2019-03-15 graphics/py-qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-iconengines: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-imageformats: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-pixeltool: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qxv: Qt4 has been EOL since december 2015, qxv is unmaintained 2019-03-15 graphics/scantailor: Qt4 has been EOL since december 2015 2019-03-15 graphics/seexpr: Qt4 has been EOL since december 2015 2019-03-15 graphics/smillaenlarger: Qt4 has been EOL since december 2015 2019-03-15 graphics/structuresynth: Qt4 has been EOL since december 2015 2019-03-15 graphics/yagf: Qt4 has been EOL since december 2015 2019-03-15 japanese/qt4-codecs-jp: Qt4 has been EOL since december 2015 2019-03-15 korean/qt4-codecs-kr: Qt4 has been EOL since december 2015 2019-03-15 mail/qgmailnotifier: Qt4 has been EOL since december 2015 2019-03-15 math/qtiplot: Qt4 has been EOL since december 2015 2019-03-15 math/qtoctave: Qt4 has been EOL since december 2015 2019-03-15 math/qwtplot3d-qt4: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-demo: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qmetro: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-l10n: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtconfig: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtdemo: Qt4 has been EOL since december 2015 2019-03-15 misc/saaghar: Qt4 has been EOL since december 2015 2019-03-15 multimedia/2mandvd: Qt4 has been EOL since december 2015 2019-03-15 multimedia/abby: Qt4 has been EOL since december 2015 2019-03-15 multimedia/avidemux-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/gstreamer-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mediadownloader: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mlt-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/phonon-xine: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-phonon: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp-plugin-pack: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-mobility: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/umplayer: Qt4 has been EOL since december 2015 2019-03-15 net/avahi-qt4: Qt4 has been EOL since december 2015 2019-03-15 net/cagibi: Qt4 has been EOL since december 2015 2019-03-15 net/hupnp: Qt4 has been EOL since december 2015 2019-03-15 net/ostinato: Qt4 has been EOL since december 2015 2019-03-15 net/py-qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qjsonrpc: Qt4 has been EOL since december 2015 2019-03-15 net/qoauth: Qt4 has been EOL since december 2015 2019-03-15 net/qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qtweetlib: Qt4 has been EOL since december 2015 2019-03-15 net-im/libjreen: Qt4 has been EOL since december 2015 2019-03-15 net-im/psimedia: Qt4 has been EOL since december 2015 2019-03-15 net-im/ramblercontacts: Qt4 has been EOL since december 2015 2019-03-15 net-im/telepathy-logger-qt4: Qt4 has been EOL since december 2015 2019-03-15 net-im/turpial: Qt4 has been EOL since december 2015 2019-03-15 net-im/vacuum-im: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/nagiosagent: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/qkismet: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/bitmessage: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/eiskaltdcpp-qt: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/valknut: Qt4 has been EOL since december 2015 2019-03-15 polish/qfaktury: Qt4 has been EOL since december 2015 2019-03-15 print/kpdftool: Qt4 has been EOL since december 2015 2019-03-15 print/scribus: Qt4 has been EOL since december 2015 2019-03-15 science/MOOSE-neural-simulator: Qt4 has been EOL since december 2015 2019-03-15 science/avogadro: Qt4 has been EOL since december 2015 2019-03-15 science/openstructure: Qt4 has been EOL since december 2015 2019-03-15 science/py-veusz: Qt4 has been EOL since december 2015 2019-03-15 science/qtresistors: Qt4 has been EOL since december 2015 2019-03-15 security/keepassx2: Qt4 has been EOL since december 2015 2019-03-15 security/kqoauth: Qt4 has been EOL since december 2015 2019-03-15 security/tpmmanager: Qt4 has been EOL since december 2015 2019-03-15 sysutils/android-file-transfer-qt4: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bacula9-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/policykit-qt: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qpxtool: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qsynergy: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qzeitgeist: Qt4 has been EOL since december 2015 2019-03-15 sysutils/searchmonkey: Qt4 has been EOL since december 2015 2019-03-15 sysutils/unetbootin: Qt4 has been EOL since december 2015 2019-03-15 textproc/beediff: Qt4 has been EOL since december 2015 2019-03-15 textproc/dixit: Qt4 has been EOL since december 2015 2019-03-15 textproc/goldendict: Qt4 has been EOL since december 2015 2019-03-15 textproc/ibus-qt: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-clucene: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns-tool: Qt4 has been EOL since december 2015 2019-03-15 textproc/scim-bridge-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/uim-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/xxdiff: Qt4 has been EOL since december 2015 2019-03-15 www/aria2fe: Qt4 has been EOL since december 2015 2019-03-15 www/cutycapt: Qt4 has been EOL since december 2015 2019-03-15 www/py-qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qupzilla-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11/leechcraft: Qt4 has been EOL since december 2015 2019-03-15 x11/py-qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qimageblitz: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-graphicssystems-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-inputmethods: Qt4 has been EOL since december 2015 2019-03-15 x11/qxkb: Qt4 has been EOL since december 2015 2019-03-15 x11-fonts/fontmatrix: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-float: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-phase: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-quantumstyle: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qtcurve-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/attica: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/py-qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4pas: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/soqt: Qt4 has been EOL since december 2015 2019-03-15 x11-wm/qlwm: Qt4 has been EOL since december 2015 Approved by: portmgr (implicit) --- sysutils/unetbootin/files/patch-unetbootin.cpp | 270 ------------------------- 1 file changed, 270 deletions(-) delete mode 100644 sysutils/unetbootin/files/patch-unetbootin.cpp (limited to 'sysutils/unetbootin/files/patch-unetbootin.cpp') diff --git a/sysutils/unetbootin/files/patch-unetbootin.cpp b/sysutils/unetbootin/files/patch-unetbootin.cpp deleted file mode 100644 index 0c236f8baa59..000000000000 --- a/sysutils/unetbootin/files/patch-unetbootin.cpp +++ /dev/null @@ -1,270 +0,0 @@ ---- unetbootin.cpp.orig 2017-07-14 08:54:12 UTC -+++ unetbootin.cpp -@@ -301,8 +301,13 @@ bool unetbootin::ubninitialize(QListcurrentText(); - devluid = getdevluid(targetDev); - ginstallDir = ""; - installDir = ginstallDir; - targetDrive = QString("%1/").arg(locatemountpoint(targetDev)); -+#endif -+#ifdef Q_OS_FREEBSD -+ QStringList driveinfo = driveselect->currentText().split(":"); -+ targetDev = driveinfo.at(0); -+ installDir = ginstallDir = ""; -+ targetDrive = QString("%1/").arg(driveinfo.at(1)); -+#endif - } - #ifdef Q_OS_LINUX - if (targetDev.contains(QRegExp("p\\d$"))) -@@ -3528,7 +3613,7 @@ void unetbootin::runinst() - else - rawtargetDev = QString(targetDev).remove(QRegExp("\\d$")); - #endif --#ifdef Q_OS_MAC -+#ifdef Q_OS_UNIX - rawtargetDev = QString(targetDev).remove(QRegExp("s\\d$")); - #endif - #endif -@@ -3724,7 +3809,7 @@ void unetbootin::writegrub2cfg() - QString menulstxt = QString( - "%9\n\n" - #ifndef NODEFAULTBOOT -- "\nmenuentry \""UNETBOOTINB"\" {\n" -+ "\nmenuentry \"" UNETBOOTINB "\" {\n" - "\tset root=%8\n" - "\t%1 %2 %3 %4\n" - "\t%5 %6 %7\n" -@@ -3845,7 +3930,7 @@ void unetbootin::runinsthdd() - "timeout 10\n" - #endif - #ifndef NODEFAULTBOOT -- "\ntitle "UNETBOOTINB"\n" -+ "\ntitle " UNETBOOTINB "\n" - #ifdef Q_OS_WIN32 - "find --set-root %3\n" - #endif -@@ -4281,21 +4366,47 @@ void unetbootin::runinstusb() - instIndvfl("libutil.c32", QString("%1libutil.c32").arg(targetPath)); - instIndvfl("libcom32.c32", QString("%1libcom32.c32").arg(targetPath)); - } -+ setuppersspace(); -+#ifdef Q_OS_FREEBSD -+ /* -+ * On FreeBSD, we only support installing on MSDOSFS (no -+ * extlinux in the ports). This also simplifies things -+ * a bit, and that's what most users usually want anyway. -+ * -+ * Because of syslinux' stupidity, we have to remove any -+ * existing ldlinux.c32 and ldlinux.sys files, otherwise -+ * it will fail to install loader (even with -f switch). -+ * Then we have to unmount the filesystem to avoid the -+ * "Operation not permitted" error, and must enforce it -+ * because syslinux expects a block device, and, well, -+ * there are no "block devices" in FreeBSD. -+ */ -+ rmFile(targetPath + "ldlinux.c32"); -+ rmFile(targetPath + "ldlinux.sys"); -+ callexternapp("umount", targetDev); -+ callexternapp(syslinuxcommand, "-i -f " + targetDev); -+ -+ if (rawtargetDev != targetDev) -+ { -+ /* -+ * We have partition table (not operating on raw -+ * disk), so we need to install MBR and mark our -+ * partition as active. Assume our targetDev is -+ * /dev/{da,mmcsd}XsY and use the last digit as -+ * partition index for gpart(8). -+ */ -+ QString idx = targetDev.right(1); -+ callexternapp("gpart", -+ "bootcode -b /boot/mbr " + rawtargetDev); -+ callexternapp("gpart", "set -a " -+ "active -i " + idx + " " + rawtargetDev); -+ } -+#endif - fininstall(); - } - --void unetbootin::killApplication() -+void unetbootin::setuppersspace() - { -- exit(0); --} -- --void unetbootin::fininstall() --{ -- #ifdef Q_OS_UNIX -- this->tprogress->setValue(this->tprogress->maximum()*2/3); -- pdesc1->setText(tr("Syncing filesystems")); -- callexternapp("sync", ""); -- #endif - if (this->persistenceSpaceMB > 0) - { - pdesc1->setText(tr("Setting up persistence")); -@@ -4334,6 +4445,20 @@ void unetbootin::fininstall() - rmFile(mke2fscommand); - #endif - } -+} -+ -+void unetbootin::killApplication() -+{ -+ exit(0); -+} -+ -+void unetbootin::fininstall() -+{ -+ #ifdef Q_OS_UNIX -+ this->tprogress->setValue(this->tprogress->maximum()*2/3); -+ pdesc1->setText(tr("Syncing filesystems")); -+ callexternapp("sync", ""); -+ #endif - pdesc1->setText(""); - progresslayer->setEnabled(false); - progresslayer->hide(); -@@ -4343,7 +4468,7 @@ void unetbootin::fininstall() - sdesc4->setText(QString("%1 %2").arg(sdesc4->text()).arg(trcurrent)); - if (installType == tr("Hard Disk")) - { -- rebootmsgtext->setText(tr("After rebooting, select the "UNETBOOTINB" menu entry to boot.%1").arg(postinstmsg)); -+ rebootmsgtext->setText(tr("After rebooting, select the " UNETBOOTINB " menu entry to boot.%1").arg(postinstmsg)); - } - if (installType == tr("USB Drive")) - { -- cgit v1.2.3