[Midnightbsd-cvs] mports [18933] trunk/x11-wm/fvwm2: fix build of fvwm2 as seen on magus

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue May 12 12:19:28 EDT 2015 

Revision: 18933
          http://svnweb.midnightbsd.org/mports/?rev=18933
Author:   laffer1
Date:     2015-05-12 12:19:28 -0400 (Tue, 12 May 2015)
Log Message:
-----------
fix build of fvwm2 as seen on magus

Modified Paths:
--------------
    trunk/x11-wm/fvwm2/Makefile
    trunk/x11-wm/fvwm2/pkg-plist

Added Paths:
-----------
    trunk/x11-wm/fvwm2/files/patch-libs-Ficonv.c

Modified: trunk/x11-wm/fvwm2/Makefile
===================================================================
--- trunk/x11-wm/fvwm2/Makefile	2015-05-12 16:15:37 UTC (rev 18932)
+++ trunk/x11-wm/fvwm2/Makefile	2015-05-12 16:19:28 UTC (rev 18933)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	2.6.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -10,9 +11,10 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Popular virtual window manager for X
-LICENSE=	agg
-#it's gpl2 + x11 and other licenses.
 
+LICENSE=	gpl2 mit
+LICENSE_COMB=	multi
+
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Other ports this port cannot coexist with
@@ -20,23 +22,21 @@
 NO_LATEST_LINK=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include
-CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
-USE_AUTOTOOLS=	autoconf
-USE_GMAKE=	yes
-USE_XORG=	xpm xft
-USE_BZIP2=	yes
-WANT_GNOME=	yes
+CONFIGURE_ARGS=	--disable-mandoc --without-gnome --disable-gtk
+USES=		gmake perl5 pkgconfig tar:bzip2
+USE_XORG=	xcursor xft xinerama xpm xrender
 
-OPTIONS_DEFINE=	ICONS ICONV STROKE RPLAY SESSION_MGMT PNG SVG BIDI NLS IMLIB GNOME1
-OPTIONS_DEFAULT=	ICONV ICONV PNG
+OPTIONS_DEFINE=	ICONS ICONV STROKE RPLAY SESSION_MGMT PNG SVG BIDI NLS
+OPTIONS_DEFAULT=ICONS ICONV SESSION_MGMT PNG
+OPTIONS_SUB=	yes
+
 STROKE_DESC=		support for mouse gestures
 RPLAY_DESC=		RPlay support in FvwmEvent
 SESSION_MGMT_DESC=	Session Management support
 BIDI_DESC=		Asian bi-directional text support
-IMLIB_DESC=		imlib library (requires gtk12)
-GNOME1_DESC=		GNOME 1 desktop support
 
+PLIST_SUB=	FVWM_VERSION="${PORTVERSION}"
+
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MICONS}
@@ -44,16 +44,14 @@
 DISTFILES+=	${FVWM_ICONS}.tar.bz2
 .endif
 
-.if ! ${PORT_OPTIONS:MICONV}
+.if ${PORT_OPTIONS:MICONV}
+USES+=			iconv
+.else
 CONFIGURE_ARGS+=	--disable-iconv
-.else
-USES+=			iconv
-CONFIGURE_ARGS+=	--with-iconv-library=${LOCALBASE}/lib \
-			--with-iconv-includes=${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MSTROKE}
-LIB_DEPENDS+=	stroke.0:${PORTSDIR}/devel/libstroke
+LIB_DEPENDS+=	libstroke.so:${PORTSDIR}/devel/libstroke
 CONFIGURE_ARGS+=	--with-stroke-library=${LOCALBASE}/lib \
 			--with-stroke-includes=${LOCALBASE}/include
 .else
@@ -61,7 +59,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MRPLAY}
-LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
+LIB_DEPENDS+=	librplay.so:${PORTSDIR}/audio/rplay
 CONFIGURE_ARGS+=	--with-rplay-library=${LOCALBASE}/lib \
 			--with-rplay-includes=${LOCALBASE}/include
 .else
@@ -68,12 +66,14 @@
 CONFIGURE_ARGS+=	--without-rplay-library
 .endif
 
-.if ! ${PORT_OPTIONS:MSESSION_MGMT}
+.if ${PORT_OPTIONS:MSESSION_MGMT}
+USE_XORG+=	sm
+.else
 CONFIGURE_ARGS+=	--disable-sm
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include \
 			--with-png-library=${LOCALBASE}/lib
 .else
@@ -87,7 +87,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MBIDI}
-LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
+LIB_DEPENDS+=	libfribidi.so:${PORTSDIR}/converters/fribidi
 CONFIGURE_ARGS+=	--enable-bidi \
 			--with-bidi-bindir=${LOCALBASE}/bin
 .else
@@ -94,78 +94,40 @@
 CONFIGURE_ARGS+=	--disable-bidi
 .endif
 
-PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
-
-.if ${PORT_OPTIONS:MIMLIB} && !defined(WITHOUT_GTK)
-USE_GNOME+=	imlib
-CONFIGURE_ARGS+=	--enable-gtktest --enable-imlibtest
-PLIST_SUB+=	GTK=""
-MAN1+=		FvwmGtk.1
-.else
-CONFIGURE_ARGS+=	--disable-gtktest --disable-imlibtest \
-			--with-gtk-prefix=/no/dir --with-imlib-prefix=/no/dir
-PLIST_SUB+=	GTK="@comment not installed: "
-WITHOUT_GNOME=	true
-.endif
-
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=	--with-intl-library=${LOCALBASE}/lib \
 			--with-intl-includes=${LOCALBASE}/include
-PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment not installed: "
 .endif
 
-.if ${PORT_OPTIONS:MGNOME1}
-USE_GNOME+=gnomelibs
-CONFIGURE_ARGS+=	--with-gnome
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=--without-iconv-library
 .else
-CONFIGURE_ARGS+=	--without-gnome
+CONFIGURE_ARGS+=--with-iconv-library=${ICONV_PREFIX}/lib \
+		--with-iconv-includes=${ICONV_PREFIX}/include
 .endif
 
-MAN1+=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
-	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
-	FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmIconBox.1 \
-	FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
-	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
-	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 fvwm-menu-desktop.1 \
-	fvwm-menu-directory.1 fvwm-menu-headlines.1 fvwm-menu-xlock.1 \
-	fvwm.1 fvwm-root.1 fvwm-config.1 fvwm-bug.1 \
-	fvwm-convert-2.4.1 fvwm-convert-2.6.1 \
-	FvwmPerl.1 fvwm-perllib.1 FvwmProxy.1 FvwmTabs.1 FvwmWindowMenu.1 \
-	FvwmGtkDebug.1
-
-MLINKS=	fvwm.1 fvwm2.1 \
-	fvwm-root.1 xpmroot.1
-
 .if ${PORT_OPTIONS:MICONS}
-PLIST_SUB+=	ICONS=""
 post-extract:
 	@${MKDIR} ${WRKDIR}/icons
 	@${TAR} -xzf ${DISTDIR}/${FVWM_ICONS}.tar.bz2 -C ${WRKDIR}/icons
-.else
-PLIST_SUB+=	ICONS="@comment not installed: "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
-		${WRKSRC}/modules/FvwmM4/FvwmM4.c \
-		${WRKSRC}/configure
+		${WRKSRC}/modules/FvwmM4/FvwmM4.c
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
-		${PREFIX}/etc/system.fvwm2rc.dist
-	@if [ ! -e ${PREFIX}/etc/system.fvwm2rc ]; then \
-		${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
-			${PREFIX}/etc/system.fvwm2rc; \
-	fi
-
+	${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${STAGEDIR}${PREFIX}/etc/system.fvwm2rc.dist
 .if ${PORT_OPTIONS:MICONS}
-	@${MKDIR} ${PREFIX}/share/fvwm/pixmaps
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/icons/${FVWM_ICONS}/*.xpm \
-		${PREFIX}/share/fvwm/pixmaps
+		${STAGEDIR}${PREFIX}/share/fvwm/pixmaps
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: trunk/x11-wm/fvwm2/files/patch-libs-Ficonv.c
===================================================================
--- trunk/x11-wm/fvwm2/files/patch-libs-Ficonv.c	                        (rev 0)
+++ trunk/x11-wm/fvwm2/files/patch-libs-Ficonv.c	2015-05-12 16:19:28 UTC (rev 18933)
@@ -0,0 +1,11 @@
+--- libs/Ficonv.c.orig	2011-08-16 09:05:53.000000000 +0200
++++ libs/Ficonv.c	2014-03-29 17:17:54.000000000 +0100
+@@ -36,7 +36,7 @@
+ #if defined(USE_LIBICONV) && !defined (_LIBICONV_H)
+ #error libiconv in use but included iconv.h not from libiconv
+ #endif
+-#if !defined(USE_LIBICONV) && defined (_LIBICONV_H)
++#if !defined(USE_LIBICONV) && defined (_LIBICONV_H) && !defined (LIBICONV_PLUG)
+ #error libiconv not in use but included iconv.h is from libiconv
+ #endif
+ #endif /* FiconvSupport */


Property changes on: trunk/x11-wm/fvwm2/files/patch-libs-Ficonv.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-wm/fvwm2/pkg-plist
===================================================================
--- trunk/x11-wm/fvwm2/pkg-plist	2015-05-12 16:15:37 UTC (rev 18932)
+++ trunk/x11-wm/fvwm2/pkg-plist	2015-05-12 16:19:28 UTC (rev 18933)
@@ -33,7 +33,6 @@
 libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
 libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
 libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
-%%GTK%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
 libexec/fvwm/%%FVWM_VERSION%%/FvwmGtkDebug
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
@@ -55,6 +54,50 @@
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
 libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
+man/man1/FvwmAnimate.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmCommand.1.gz
+man/man1/FvwmConsole.1.gz
+man/man1/FvwmConsoleC.pl.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmDragWell.1.gz
+man/man1/FvwmEvent.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmGtkDebug.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIconMan.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmPerl.1.gz
+man/man1/FvwmProxy.1.gz
+man/man1/FvwmRearrange.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScript.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTabs.1.gz
+man/man1/FvwmTaskBar.1.gz
+man/man1/FvwmTheme.1.gz
+man/man1/FvwmWharf.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmWindowMenu.1.gz
+man/man1/fvwm-bug.1.gz
+man/man1/fvwm-config.1.gz
+man/man1/fvwm-convert-2.4.1.gz
+man/man1/fvwm-convert-2.6.1.gz
+man/man1/fvwm-perllib.1.gz
+man/man1/fvwm-menu-desktop.1.gz
+man/man1/fvwm-menu-directory.1.gz
+man/man1/fvwm-menu-headlines.1.gz
+man/man1/fvwm-menu-xlock.1.gz
+man/man1/fvwm-root.1.gz
+man/man1/fvwm.1.gz
+man/man1/fvwm2.1.gz
 %%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jnews.xpm
 %%ICONS%%%%DATADIR%%/pixmaps/Jrecycle.xpm
@@ -446,28 +489,7 @@
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fvwm.mo
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv_SE
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
- at dirrm %%DATADIR%%/perllib/General
- at dirrm %%DATADIR%%/perllib/FVWM/Tracker
- at dirrm %%DATADIR%%/perllib/FVWM/Module
- at dirrm %%DATADIR%%/perllib/FVWM
- at dirrm %%DATADIR%%/perllib
-%%ICONS%%@dirrm %%DATADIR%%/pixmaps
- at dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%/commands
- at dirrm %%DOCSDIR%%/fvwm
- at dirrm %%DOCSDIR%%/images/svg_rendering
- at dirrm %%DOCSDIR%%/images
- at dirrm %%DOCSDIR%%/modules/images/FvwmTabs
- at dirrm %%DOCSDIR%%/modules/images
- at dirrm %%DOCSDIR%%/modules
- at dirrm %%DOCSDIR%%
- at dirrm libexec/fvwm/%%FVWM_VERSION%%
- at dirrm libexec/fvwm
+ at dir %%DOCSDIR%%/commands
+ at dir %%DOCSDIR%%/fvwm
+ at dir %%DOCSDIR%%/images/svg_rendering
+ at dir %%DOCSDIR%%/modules/images/FvwmTabs

More information about the Midnightbsd-cvs mailing list