Update to 2.6.5.

tested mikeb@, maintainer timeout
This commit is contained in:
shadchin 2012-05-19 18:31:07 +00:00
parent c16287e312
commit 427afe61f5
4 changed files with 22 additions and 24 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.54 2012/03/29 13:39:00 sthen Exp $
# $OpenBSD: Makefile,v 1.55 2012/05/19 18:31:07 shadchin Exp $
COMMENT-main= multiple virtual desktop window manager, with icons
COMMENT-fvicons=multiple virtual desktop window manager icons
COMMENT-fvwm2= multiple virtual desktop window manager, without icons
VERSION= 2.6.1
VERSION= 2.6.5
DISTNAME= fvwm-${VERSION}
PKGNAME-main= fvwm2+fvicons-${VERSION}
FULLPKGNAME-fvicons=fvicons-${VERSION}
@ -24,12 +24,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xft Xinerama Xpm Xrender Xxf86vm c cairo drm expat
WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m pixman-1 png
WANTLIB += pthread pthread-stubs readline rsvg-2 termcap xcb xcb-render
WANTLIB += xcb-shm z
WANTLIB += GL ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
WANTLIB += c cairo expat fontconfig freetype gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gobject-2.0 m pixman-1 png pthread pthread-stubs
WANTLIB += readline rsvg-2 termcap xcb xcb-render xcb-shm z
MODULES= devel/gettext
@ -74,8 +72,8 @@ CONFIGURE_ARGS += --disable-bidi \
--without-gnome \
--without-stroke-library \
--with-png-includes="${LOCALBASE}/include/libpng"
CONFIGURE_ENV += CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm

View File

@ -1,10 +1,10 @@
MD5 (fvwm-2.6.1.tar.gz) = yDwYXUJBc52LYWGTPoECYA==
MD5 (fvwm-2.6.5.tar.gz) = NSj2YY+uANNz4u3UInNCkQ==
MD5 (fvwm_icons-20070101.tar.gz) = xtmISWgKHDBgZ6oIVRnkbA==
RMD160 (fvwm-2.6.1.tar.gz) = iteLp+DoeH6YgAg/UXd4Q/I+M/w=
RMD160 (fvwm-2.6.5.tar.gz) = OfMVS0rnHZNb+7hxXrK13HbMyyM=
RMD160 (fvwm_icons-20070101.tar.gz) = Iinvu8842B0TZuUtQ3AYwa7ceTQ=
SHA1 (fvwm-2.6.1.tar.gz) = toxKFXvclYlscL8jd+UjXgbVZP4=
SHA1 (fvwm-2.6.5.tar.gz) = wgDpZH0R0ai0k4xBmph/6krsZgY=
SHA1 (fvwm_icons-20070101.tar.gz) = URxxt3kjx7poza8L73mSfwu1KDI=
SHA256 (fvwm-2.6.1.tar.gz) = jS01S0s7qj5C8nDl6XS/xfU5jbWPgs2PdSoK8tD6kJ8=
SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
SHA256 (fvwm_icons-20070101.tar.gz) = oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
SIZE (fvwm-2.6.1.tar.gz) = 3452832
SIZE (fvwm-2.6.5.tar.gz) = 3449177
SIZE (fvwm_icons-20070101.tar.gz) = 363286

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2011/04/26 18:50:46 shadchin Exp $
--- configure.orig Sun Apr 17 02:35:43 2011
+++ configure Wed Apr 20 15:50:16 2011
@@ -11025,7 +11025,7 @@ if test "${with_intl_library+set}" = set; then :
$OpenBSD: patch-configure,v 1.2 2012/05/19 18:31:07 shadchin Exp $
--- configure.orig Fri Apr 20 17:03:57 2012
+++ configure Mon Apr 30 21:20:31 2012
@@ -11026,7 +11026,7 @@ if test "${with_intl_library+set}" = set; then :
else
with_intl=maybe

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-fvwm_Makefile_in,v 1.6 2011/04/26 18:50:46 shadchin Exp $
--- fvwm/Makefile.in.orig Mon Aug 9 18:28:55 2010
+++ fvwm/Makefile.in Fri Mar 4 08:25:05 2011
$OpenBSD: patch-fvwm_Makefile_in,v 1.7 2012/05/19 18:31:07 shadchin Exp $
--- fvwm/Makefile.in.orig Fri Apr 20 17:03:55 2012
+++ fvwm/Makefile.in Mon Apr 30 21:20:31 2012
@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
@ -10,7 +10,7 @@ $OpenBSD: patch-fvwm_Makefile_in,v 1.6 2011/04/26 18:50:46 shadchin Exp $
subdir = fvwm
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -449,7 +449,7 @@ uninstall-binPROGRAMS:
@@ -450,7 +450,7 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@ -19,7 +19,7 @@ $OpenBSD: patch-fvwm_Makefile_in,v 1.6 2011/04/26 18:50:46 shadchin Exp $
@rm -f fvwm$(EXEEXT)
$(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
@@ -687,7 +687,7 @@ install-dvi: install-dvi-am
@@ -689,7 +689,7 @@ install-dvi: install-dvi-am
install-dvi-am: