Date: Sun, 16 Feb 2014 18:50:43 -0500 From: George Mitchell <george+freebsd@m5p.com> To: freebsd-ports@freebsd.org Subject: Adventures in ports, chapter 340877 Message-ID: <53014ED3.1030104@m5p.com>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030608080707060309050203
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Perhaps it's just my bad luck, but updating my ports rarely goes
smoothly. Here's my current collection of patches, as of svn version
340877.
No patch for this, but with the replacement of openoffice-3 with
openoffice-4, portmaster dies when trying to install openoffice-4
without having removed openoffice-3, because they install some
files to the same location. Removing openoffice-3 first fixes the
problem. A note in UPDATING would be a big help.
devel/avarice/Makefile: libiberty is currently installed by
binutils, not gnulibiberty, as odd as that sounds.
graphics/jbig2dec/Makefile: This may have been due to some temporary
ports problem, but graphics/jbig2dec couldn't find libpng15.so unless
I specified the file revision number. I haven't recently tried
reverting this patch yet.
print/cups-base/Makefile: Couldn't compile print/cups-image without
this patch.
print/freetype2/Makefile: USE_GCC=any was needed to compile on arm.
Additional symbolic link required to build openoffice-3 (and perhaps
other ports that didn't know the include files have moved).
print/freetype2/pkg-plist: Add the above symbolic link to the
packing list.
print/hplip-plugin/Makefile: HP's plugin_install program uses a Qt4/X
user interface to get user confirmation of the license terms. But
luckily, it comes with a "-i" option that just uses a terminal.
x11/gdm/Makefile: The gnome-keyring program is installed by
security/gnome-keyring, not security/libgnome-keyring.
x11/pixman/Makefile: Patch was cribbed from a PR that I've lost track
of, but without this patch, pixman won't compile on arm.
x11/xbacklight/Makefile: Probably akin to my jbig2dec problem.
x11-drivers/Makefile: Without this patch, x11-drivers tries to
compile the broken radeonhd video driver.
(Please cc me with comments, as I am not on the ports mailing list.)
-- George Mitchell
--------------030608080707060309050203
Content-Type: text/plain; charset=us-ascii;
name="ports-340877.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="ports-340877.patch"
Index: devel/avarice/Makefile
===================================================================
--- devel/avarice/Makefile (revision 340877)
+++ devel/avarice/Makefile (working copy)
@@ -12,7 +12,7 @@
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd \
- ${LOCALBASE}/lib/libiberty.a:${PORTSDIR}/devel/gnulibiberty
+ ${LOCALBASE}/lib/libiberty.a:${PORTSDIR}/devel/binutils
USE_BZIP2= yes
USES= perl5
Index: graphics/jbig2dec/Makefile
===================================================================
--- graphics/jbig2dec/Makefile (revision 340877)
+++ graphics/jbig2dec/Makefile (working copy)
@@ -24,7 +24,7 @@
LICENSE= GPLv3
-PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS= libpng15.so.15:${PORTSDIR}/graphics/png
PNG_CONFIGURE_ON= --with-libpng=${LOCALBASE}
PNG_CFLAGS= -I${LOCALBASE}/include/libpng15
Index: print/cups-base/Makefile
===================================================================
--- print/cups-base/Makefile (revision 340877)
+++ print/cups-base/Makefile (working copy)
@@ -94,6 +94,7 @@
PKGMESSAGE= ${NONEXISTENT}
DESCR= ${MASTERDIR}/pkg-descr.client
.elif defined(CUPS_IMAGE)
+USES+= iconv
LIB_DEPENDS+= cups:${PORTSDIR}/${PKGCATEGORY}/cups-client \
jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
Index: print/freetype2/Makefile
===================================================================
--- print/freetype2/Makefile (revision 343536)
+++ print/freetype2/Makefile (working copy)
@@ -17,6 +17,7 @@
COMMENT= Free and portable TrueType font rendering engine
USE_BZIP2= yes
+USE_GCC= any
USES= gmake
MAKE_ENV= TOP=""
USE_LDCONFIG= yes
@@ -51,5 +52,6 @@
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.9
+ ln -s . ${STAGEDIR}${PREFIX}/include/freetype2/freetype
.include <bsd.port.mk>
Index: print/freetype2/pkg-plist
===================================================================
--- print/freetype2/pkg-plist (revision 343536)
+++ print/freetype2/pkg-plist (working copy)
@@ -4,6 +4,7 @@
include/freetype2/config/ftmodule.h
include/freetype2/config/ftoption.h
include/freetype2/config/ftstdlib.h
+include/freetype2/freetype
include/freetype2/freetype.h
include/freetype2/ft2build.h
include/freetype2/ftadvanc.h
Index: print/hplip-plugin/Makefile
===================================================================
--- print/hplip-plugin/Makefile (revision 340877)
+++ print/hplip-plugin/Makefile (working copy)
${WRKSRC}/plugin_install.py
do-install:
- cd ${WRKSRC} && ${PYTHON_CMD} -B plugin_install.py
+ cd ${WRKSRC} && ${PYTHON_CMD} -B plugin_install.py -i
.include <bsd.port.post.mk>
Index: x11/gdm/Makefile
===================================================================
--- x11/gdm/Makefile (revision 340877)
+++ x11/gdm/Makefile (working copy)
@@ -63,7 +63,7 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/gnome-keyring
SUB_LIST+= PAM_KEYRING=
.else
SUB_LIST+= PAM_KEYRING=\#
Index: x11/pixman/Makefile
===================================================================
--- x11/pixman/Makefile (revision 340877)
+++ x11/pixman/Makefile (working copy)
@@ -14,12 +14,12 @@
CONFIGURE_ARGS= --disable-gtk
USE_GNOME= ltverhack:30
-OPTIONS_DEFINE= SIMD
+USE_GCC= any
.include <bsd.port.options.mk>
.if ! {PORT_OPTIONS:MSIMD}
-CONFIGURE_ARGS= --disable-vmx --disable-arm-simd
+CONFIGURE_ARGS+= --disable-vmx --disable-arm-simd
. if ! ${MACHINE_CPU:Mmmx}
CONFIGURE_ARGS+= --disable-mmx
. endif
@@ -28,4 +28,5 @@
. endif
.endif
+CONFIGURE_ARGS+= --disable-arm-neon
.include <bsd.port.mk>
Index: x11/xbacklight/Makefile
===================================================================
--- x11/xbacklight/Makefile (revision 340877)
+++ x11/xbacklight/Makefile (working copy)
@@ -9,7 +9,7 @@
LICENSE= MIT
-LIB_DEPENDS= libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS= libxcb-util.so.1:${PORTSDIR}/x11/xcb-util
XORG_CAT= app
USE_XORG= x11 xrender xrandr xcb
Index: x11-drivers/Makefile
===================================================================
--- x11-drivers/Makefile (revision 340877)
+++ x11-drivers/Makefile (working copy)
@@ -39,7 +39,6 @@
SUBDIR += xf86-video-nv
SUBDIR += xf86-video-openchrome
SUBDIR += xf86-video-r128
- SUBDIR += xf86-video-radeonhd
SUBDIR += xf86-video-rdc
SUBDIR += xf86-video-rendition
SUBDIR += xf86-video-s3
--------------030608080707060309050203--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53014ED3.1030104>