Date: Fri, 06 Jun 2014 13:12:45 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@freebsd.org Cc: gnome@FreeBSD.org Subject: [PATCH] devel/glib20: It corresponds to bsd.sanity.mk. Message-ID: <53913FBD.6070106@airport.fm>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Takefu
>Organization: FOX Amateur Radio Club
>Confidential: no
>Synopsis: [PATCH] devel/glib20: It corresponds to bsd.sanity.mk.
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 8.4-RELEASE-p10 i386
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p10 FreeBSD 8.4-RELEASE-p10 #0: Fri Jun 6 08:48:32 JST
>Description:
It corresponds to bsd.sanity.mk.
GLIB_ARCH of CONFIGURE_TARGET is simply rewritten.
Port maintainer (gnome@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.02 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- glib-2.36.3.patch begins here ---
diff -ruN /usr/ports/devel/glib20/Makefile ./Makefile
--- /usr/ports/devel/glib20/Makefile 2014-06-02 02:56:38.000000000 +0900
+++ ./Makefile 2014-06-06 12:50:47.000000000 +0900
@@ -14,7 +14,6 @@
LICENSE= LGPL20
-USE_XZ= yes
PORTSCOUT= limitw:1,even
.if !defined(REFERENCE_PORT)
@@ -22,12 +21,12 @@
LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
libffi.so:${PORTSDIR}/devel/libffi
-USE_AUTOTOOLS= libtool
+GNU_CONFIGURE= yes
USE_LDCONFIG= yes
# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
# (wchar_t is used by glibmm, rawtherapee triggered this)
-USES= gettext gmake iconv:wchar_t pathfix pkgconfig shebangfix perl5
-USE_GNOME= ltverhack
+USES= gettext gmake iconv:wchar_t pathfix pkgconfig shebangfix perl5\
+ tar:xz libtool:keepla
USE_PYTHON= yes
PYTHON_PY3K_PLIST_HACK= yes
CONFIGURE_ARGS= --enable-static \
@@ -67,13 +66,7 @@
.endif
# Let glib use asm code for implementing atomic ops on i386 and amd64.
-.if ${ARCH} == "i386"
-GLIB_ARCH= i486
-.elif ${ARCH} == "amd64"
-GLIB_ARCH= x86_64
-.else
-GLIB_ARCH= ${ARCH}
-.endif
+GLIB_ARCH= ${ARCH:S,i386,i486,:S,amd64,x86_64,}
CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
.if ${PORT_OPTIONS:MCOLLATION_FIX}
--- glib-2.36.3.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53913FBD.6070106>