Commit graph

14 commits

Author SHA1 Message Date
David Naylor
09f6ce160d emulators/i386-wine(-devel|-compholio): add BUNDLE_LIBS.
The i386-wine ports bundle their own (32-bit) libraries that cause pkg-1.5
issues.  Since these libraries are under lib32 it does not cause issues
with other software.

Bump PORTREVISION [1] for the 32-bit side of the ports.  The 64-bit side of
the ports will be bumped when new packages have been prepared.

Approved by:	gerald@ [1]
Reported by:	bapt@
2015-04-19 12:37:10 +00:00
David Naylor
33c9b1b9f7 Fix CONFLICTS_INSTALL for wine-devel and related ports.
Changes:
 - Fix install conflicts [1] (for the "newly" added compholio port)
 - nvidia.sh: Gracefully handle a corrupt nVidia tarball
 - nvidia.sh: Provide checksum and size information for nVidia tarball
 - Bump master port [1] due to changes to nvidia.sh and conflicts

Approved by:    gerald@ [1]
2014-12-28 20:39:48 +00:00
David Naylor
bcaa0f659c Unbreak emulators/i386-wine(-devel) builds.
With the removal of REINPLACE_PLIST in r367153 building wine on FreeBSD/i386
broke.  This was not detected in an exp-run as i386-wine is marked IGNORE
unless WINE_CROSS_BUILD is defined (to protect the build infrastructure and
avoid confusion).

PR:	193734
2014-09-22 18:25:55 +00:00
Baptiste Daroussin
d96aa38d95 Remove support for pkg_install
Merge back bsd.pkgng.mk into bsd.port.mk
Add a note about @stopdaemon not being supported anymore

With hat:	portmgr
Differential Revision:	https://reviews.freebsd.org/D693
2014-09-01 13:03:25 +00:00
David Naylor
6f539ab817 Update emulators/i386-wine-devel (and -compholio) to 1.7.25.
Also, fix build of i386-wine-* on 32-bit environments (move $MKDIR to prior
the $INSTALL).
2014-08-30 08:03:30 +00:00
David Naylor
68ea15cd5b IGNORE emulators/i386-wine(-devel)? on ARCH=i386, fix lib bundling.
Due to the hackery things these ports do to properly work under amd64, it
results in issues for pkg.  This port - although it needs to build under
i386 - is not intended to be consumed under i386.  The normal wine(-devel)?
ports should be consumed on an i386 system and these ports should be
consumed on an amd64 system. [1]

Reorder the library detection to pick up soft dependencies first, then the
linked to libraries.  Prior to this change any libraries required by a soft
dependency wasn't bundled, for example libgnutls.so.28 did not have its
dependencies bundled. [2][3]

Requested by:	bdrewery [1]
Reported by:	Joseph Mingrone <jrm@ftfl.ca> [2]
		Beeblebrox <zaphod@berentweb.com> [3]
2014-08-25 20:02:20 +00:00
David Naylor
1d085932a2 Introduce emulators/i386-wine-compholio.
This is the companion port to wine-compholio: proving a means to compile,
and binaries, for FreeBSD/amd64.
2014-08-18 19:11:08 +00:00
David Naylor
78eec6ac57 Various improvements for emulators/i386-wine-devel.
* Add support for a forthcoming i386-wine-compholio port [1]
 * Fix binbounce for RPATH issues [1]

A port revision bump is not possible due to the complexities for the wine
ports.  The impact is minimised by timing these updates closely with the
underlying updates of wine-devel.

Requested by:	[1] Kris Moore <kris@pcbsd.org>
Reported by:	[2] Nils Beyer <nbe@renzel.net>
2014-08-09 10:17:23 +00:00
David Naylor
f4fa763b69 Update emulators/i386-wine to 1.6.1.
Changes:
 * Backport changes from emulators/i386-wine-devel
 * Fix CONFLICTS_INSTALL [1]

Approved by:	gerald [1]
2013-12-02 16:49:37 +00:00
David Naylor
10ac0e1be2 Update emulators/i386-wine-devel to 1.7.7.
Changes:
 - Fix the patch-nvidia.sh script's usage of getopt [1]
 - Fix the patching of the packages for installation on amd64 [2]
 -

Reported by:	[1] Nicole Reid <nicole@cooltrainer.org>
		[2] Piotr Kubaj <pkubaj@riseup.net>
2013-12-01 15:30:42 +00:00
David Naylor
b5da36bb93 Update emulators/i386-wine-devel to 1.7.4 and add stage support.
Port ChangeLog:
 - Update to version 1.7.4 (for pre-built packages for amd64)
 - Add stage support for both Makefile.(i386|inc)
 - Add the -devel suffix and remove LATEST_LINK
 - Teach the patch-nvidia.sh script about the -devel suffix
 - Track updates for the GECKO version (2.24)
2013-11-03 21:13:34 +00:00
David Naylor
563811c9b2 Fix emulators/i386-wine-devel when installing on -current.
Correct version detection to complain when installing outside the
supported range (8.3+ and 9.1+).

Also, exclude ldconfig data from pkg-plist.

Reported by:	Sergey V. Dyatko
2013-08-12 06:07:05 +00:00
David Naylor
ec2cecb2dd Update emulators/i386-wine-devel options with GECKO and MONO.
The binary package for amd64 systems does not bundle GECKO or MONO
however it is useful (for some) to have those files installed, so
allow the package to have a run-time dependency on the ports that
provide Gecko and Mono support.

PORTREVISION is not bumped since nothing changes in the default
(BATCH) case.
2013-08-11 08:19:18 +00:00
David Naylor
3972cac2b8 Enable packaging of emulators/i386-wine-devel on amd64 (part 1/2).
CHANGES
-------
Provide two ports, in one.  When compiling on i386 the port behaves
as a slave port of wine-devel, creating a package suitable for
installation on amd64.  No change here

When compiling on amd64 the port manually installs the provided
amd64 packages (see wiki.FreeBSD.org/i386-Wine for those packages)
and thus allowing the packages to be "build" using the FreeBSD
infrastructure, and critically, to appear in the standard package
set without requiring users to manually add these packages to their
systems.

DESIGN
------
The bootstrapping (for choosing between i386 and amd64 Makefiles)
was done manually as Makefile.i386 is a slave port while Makefile.inc
(for amd64) is a master port.  This situation does not work in the
current infrastructure thus requiring a manual bootstrap.

PRECEDENT
---------
Although Ports does not support cross compiling of packages there is
precedent in supplying binary packages for those situations where,
otherwise, cross compiling is required.

In support of taking this approach I site:
 - misc/compat?x ports
 - */linux-* ports
2013-08-10 15:43:59 +00:00