svn commit: r399663 - in head/x11-wm/golem: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Oct 19 12:50:38 UTC 2015
Author: danfe
Date: Mon Oct 19 12:50:37 2015
New Revision: 399663
URL: https://svnweb.freebsd.org/changeset/ports/399663
Log:
- Attempt to unbreak on PowerPC (verified) and SPARC (not verified)
- Use option helpers, GC no longer needed WANT_GNOME, sort USES, and
include b.p.m. bits just once at the end
- Drop explicit "support" for ia64: the port is marked broken on it,
while the architecture itself was never a first-class citizen in
FreeBSD and official killed in -CURRENT for a while now
Modified:
head/x11-wm/golem/Makefile
head/x11-wm/golem/files/patch-configure
Modified: head/x11-wm/golem/Makefile
==============================================================================
--- head/x11-wm/golem/Makefile Mon Oct 19 12:50:32 2015 (r399662)
+++ head/x11-wm/golem/Makefile Mon Oct 19 12:50:37 2015 (r399663)
@@ -12,42 +12,31 @@ COMMENT= Small window manager with theme
LICENSE= BSD3CLAUSE
-OPTIONS_DEFINE= ESOUND XINERAMA
-OPTIONS_DEFAULT= XINERAMA
-
-USES= perl5 gmake tar:bzip2
+USES= gmake perl5 tar:bzip2
USE_PERL5= build
USE_XORG= xpm
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-i18n
MAKE_ARGS= DEVEL=1
-.include <bsd.port.pre.mk>
+CFLAGS_amd64= -fPIC
+
+OPTIONS_DEFINE= ESOUND XINERAMA
+OPTIONS_DEFAULT= XINERAMA
+OPTIONS_SUB= yes
+
+ESOUND_USE= GNOME=esound
+ESOUND_CONFIGURE_ON= --enable-sound
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+= -fPIC
-.endif
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN= Does not compile on ia64, powerpc, or sparc64
-.endif
-
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+= esound
-CONFIGURE_ARGS+=--enable-sound
-PLIST_SUB+= ESOUND=""
-.else
-PLIST_SUB+= ESOUND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+= xinerama
-CONFIGURE_ARGS+=--enable-xinerama
-.endif
+XINERAMA_USE= XORG=xinerama
+XINERAMA_CONFIGURE_ON= --enable-xinerama
post-patch:
- @${REINPLACE_CMD} -e \
- '/cl_thread.c/d' ${WRKSRC}/complib/user/Makefile
+ @${REINPLACE_CMD} -e '/cl_thread\.c/d' ${WRKSRC}/complib/user/Makefile
+ @${REINPLACE_CMD} -e 's,^#include.*,typedef struct { \
+ int counter; } atomic_t;,' \
+ ${WRKSRC}/complib/asm-generic/cl_atomic_asm.h \
+ ${WRKSRC}/complib/asm-ppc/cl_atomic_asm.h
# avoid using standard MAKE_ENV
do-build:
@@ -60,4 +49,4 @@ do-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/golem
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/golem/plugins/*.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/x11-wm/golem/files/patch-configure
==============================================================================
--- head/x11-wm/golem/files/patch-configure Mon Oct 19 12:50:32 2015 (r399662)
+++ head/x11-wm/golem/files/patch-configure Mon Oct 19 12:50:37 2015 (r399663)
@@ -1,10 +1,12 @@
---- configure.orig 2006-03-02 03:59:55.000000000 +0900
-+++ configure 2011-08-13 07:46:25.000000000 +0900
-@@ -5669,6 +5669,7 @@
+--- configure.orig 2006-03-01 18:59:55 UTC
++++ configure
+@@ -5669,7 +5669,8 @@ test -n "$target_alias" &&
COMPLIB_ARCH=CONFIG_GENERIC
case "$target" in
i386* | i486* | i686* ) COMPLIB_ARCH=CONFIG_X86;;
+-ppc* ) COMPLIB_ARCH=CONFIG_PPC;;
+amd64* ) COMPLIB_ARCH=CONFIG_X86_64;;
- ppc* ) COMPLIB_ARCH=CONFIG_PPC;;
++powerpc* ) COMPLIB_ARCH=CONFIG_PPC;;
esac
+
More information about the svn-ports-all
mailing list