ports/175582: x11-wm/windowmaker: Update to version 0.95.4

KATO Tsuguru tkato432 at yahoo.com
Fri Jan 25 21:10:05 UTC 2013


>Number:         175582
>Category:       ports
>Synopsis:       x11-wm/windowmaker: Update to version 0.95.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 25 21:10:05 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update x11-wm/libwraster to version 0.95.4
- Update x11-wm/windowmaker to version 0.95.4

[x11-wm/windowmaker]
New file:
files/patch-Makefile.in
files/patch-WINGs__Examples__Makefile.in
files/patch-WINGs__Extras__Makefile.in
files/patch-WINGs__Makefile.in
files/patch-WINGs__Tests__Makefile.in
files/patch-WPrefs.app__Makefile.in
files/patch-doc__Makefile.in
files/patch-src__Makefile.in
files/patch-util__Makefile.in

>How-To-Repeat:
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	x11-wm_libwraster.diff
#	x11-wm_windowmaker.diff
#
echo x - x11-wm_libwraster.diff
sed 's/^X//' >x11-wm_libwraster.diff << 'c433d47bf29dbe912b39dcfb386a04a4'
Xdiff -urN /usr/ports/x11-wm/libwraster/Makefile x11-wm/libwraster/Makefile
X--- /usr/ports/x11-wm/libwraster/Makefile	2012-11-08 06:37:58.000000000 +0900
X+++ x11-wm/libwraster/Makefile	2013-01-15 22:34:54.000000000 +0900
X@@ -3,28 +3,28 @@
X PORTNAME=	libwraster
X PORTREVISION=	0
X 
X-COMMENT=	libwraster from Window Maker
X+COMMENT=	Window Maker raster graphics library
X+
X+LICENSE=	LGPL21
X 
X MASTERDIR=	${.CURDIR}/../windowmaker
X 
X-LWR_SLAVE=	yes
X+BUILD_WRKSRC=	${WRKSRC}/wrlib
X+INSTALL_WRKSRC=	${WRKSRC}/wrlib
X 
X PATCHDIR=	# To void equivalent in master port
X DESCR=		${.CURDIR}/pkg-descr
X PLIST=		${.CURDIR}/pkg-plist
X 
X-CONFLICTS=	windowmaker-0.*
X+MAN1=		get-wraster-flags.1
X 
X-post-patch:
X-	@${CP} ${WRKSRC}/wrlib/Makefile.in ${WRKSRC}/wrlib/Makefile.in.presed
X-	@${SED} -e s#$$\(libdir\)/pkgconfig#${PREFIX}/libdata/pkgconfig#g \
X-	    ${WRKSRC}/wrlib/Makefile.in.presed > ${WRKSRC}/wrlib/Makefile.in
X+LWR_SLAVE=	yes
X 
X-do-build:
X+pre-build:
X 	cd ${WRKSRC} && ${MAKE} config-paths.h
X-	cd ${WRKSRC}/wrlib && ${MAKE}
X 
X-do-install:
X-	cd ${WRKSRC}/wrlib && ${MAKE} install
X+post-install:
X+	(cd ${WRKSRC}/doc \
X+		&& ${INSTALL_MAN} get-wraster-flags.1 ${MANPREFIX}/man/man1)
X 
X .include "${MASTERDIR}/Makefile"
c433d47bf29dbe912b39dcfb386a04a4
echo x - x11-wm_windowmaker.diff
sed 's/^X//' >x11-wm_windowmaker.diff << 'd5b8ed6cf963cf8f65dced311ababb02'
Xdiff -urN /usr/ports/x11-wm/windowmaker/Makefile x11-wm/windowmaker/Makefile
X--- /usr/ports/x11-wm/windowmaker/Makefile	2012-12-30 14:18:16.000000000 +0900
X+++ x11-wm/windowmaker/Makefile	2013-01-15 22:33:05.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/x11-wm/windowmaker/Makefile 309645 2012-12-30 02:28:45Z marius $
X 
X PORTNAME?=	windowmaker
X-PORTVERSION=	0.95.3
X+PORTVERSION=	0.95.4
X PORTREVISION?=	0
X CATEGORIES=	x11-wm windowmaker
X MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
X@@ -12,26 +12,24 @@
X MAINTAINER=	ports at FreeBSD.org
X COMMENT?=	GNUstep-compliant NeXTstep window manager clone
X 
X+LICENSE?=	GPLv2
X+
X LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
X 		png15:${PORTSDIR}/graphics/png \
X 		jbig:${PORTSDIR}/graphics/jbigkit \
X 		tiff:${PORTSDIR}/graphics/tiff
X 
X .if !defined(LWR_SLAVE)
X-RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
X+LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
X+RUN_DEPENDS+=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
X USE_PERL5=	yes
X OPTIONS_DEFINE=	NLS XRANDR
X .endif
X 
X-MAKE_JOBS_SAFE=	yes
X-
X-USE_AUTOTOOLS=	libtool
X-USE_GNOME=	gnomehack
X USE_XORG=	xft xinerama xmu xpm
X-USE_PKGCONFIG=	yes
X-GNU_CONFIGURE=	yes
X-CPPFLAGS+=	-I${LOCALBASE}/include
X-LDFLAGS+=	-L${LOCALBASE}/lib
X+USE_GNOME=	gnomehack
X+USE_PKGCONFIG=	build
X+USE_AUTOTOOLS=	libtool
X CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
X 		--with-nlsdir=${PREFIX}/share/locale \
X 		--with-libs-from="-L${LOCALBASE}/lib" \
X@@ -41,6 +39,10 @@
X 		--enable-xinerama --enable-usermenu \
X 		--with-x
X USE_LDCONFIG=	yes
X+MAKE_JOBS_SAFE=	yes
X+
X+CPPFLAGS+=	-I${LOCALBASE}/include
X+LDFLAGS+=	-L${LOCALBASE}/lib
X 
X .include <bsd.port.pre.mk>
X 
X@@ -51,7 +53,7 @@
X .endif
X 
X .if ${OSVERSION} < 800000
X-BROKEN=		does not compile on FreeBSD 7.X
X+CPPFLAGS+=	-DHAVE_SYS_SELECT_H
X .endif
X 
X .if ${PORT_OPTIONS:MNLS}
X@@ -69,13 +71,11 @@
X CONFIGURE_ARGS+=	--enable-xrandr
X .endif
X 
X-CONFLICTS=	libwraster-0.*
X-
X MANLANG=	"" cs sk ru
X MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
X 		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
X-		get-wraster-flags.1 get-wutil-flags.1 wdread.1 WindowMaker.1x \
X-		wmagnify.1x wmgenmenu.1 wmmenugen.1 WPrefs.1x
X+		get-wutil-flags.1 wdread.1 WindowMaker.1x wmagnify.1x \
X+		wmgenmenu.1 wmmenugen.1 WPrefs.1x
X 
X MAN8_EN=	upgrade-windowmaker-defaults.8
X 
X@@ -111,7 +111,7 @@
X post-install:
X 	@${MKDIR} ${PREFIX}/GNUstep/Applications/WPrefs.app/xpm
X 	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
X-.if !defined(NOPORTDOCS)
X+.if ${PORT_OPTIONS:MDOCS}
X 	@${MKDIR} ${DOCSDIR}
X 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
X .endif
Xdiff -urN /usr/ports/x11-wm/windowmaker/distinfo x11-wm/windowmaker/distinfo
X--- /usr/ports/x11-wm/windowmaker/distinfo	2012-11-08 06:35:45.000000000 +0900
X+++ x11-wm/windowmaker/distinfo	2013-01-13 19:25:03.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (WindowMaker-0.95.3.tar.gz) = b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a
X-SIZE (WindowMaker-0.95.3.tar.gz) = 2780245
X+SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
X+SIZE (WindowMaker-0.95.4.tar.gz) = 2789390
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-Makefile.in x11-wm/windowmaker/files/patch-Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-Makefile.in	2013-01-14 19:06:54.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- Makefile.in.orig
X++++ Makefile.in
X+@@ -271,7 +271,7 @@
X+ BUILT_SOURCES = config-paths.h
X+ DISTCLEANFILES = config-paths.h
X+ ACLOCAL_AMFLAGS = -I m4
X+-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc test
X++SUBDIRS = WINGs src util po WindowMaker wmlib WPrefs.app doc test
X+ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \
X+ 	INSTALL-WMAKER README.definable-cursor \
X+ 	The-perfect-Window-Maker-patch.txt \
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in	2013-01-14 19:07:09.000000000 +0900
X@@ -0,0 +1,20 @@
X+--- WINGs/Examples/Makefile.in.orig
X++++ WINGs/Examples/Makefile.in
X+@@ -254,7 +254,7 @@
X+ wprefs_bindir = @wprefs_bindir@
X+ wprefs_datadir = @wprefs_datadir@
X+ AUTOMAKE_OPTIONS = 
X+-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
X++LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
X+ 	$(top_builddir)/WINGs/libWUtil.la \
X+ 	@XFTLIBS@ @INTLIBS@
X+ 
X+@@ -265,7 +265,7 @@
X+ connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
X+ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
X+ server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
X+-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
X++AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
X+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
X+ 
X+ all: all-am
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in	2013-01-14 19:07:29.000000000 +0900
X@@ -0,0 +1,23 @@
X+--- WINGs/Extras/Makefile.in.orig
X++++ WINGs/Extras/Makefile.in
X+@@ -86,7 +86,6 @@
X+ test_SOURCES = test.c
X+ test_OBJECTS = test.$(OBJEXT)
X+ am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la
X+ test_DEPENDENCIES = wtableview.o wtabledelegates.o \
X+ 	$(am__DEPENDENCIES_1)
X+@@ -288,10 +287,10 @@
X+ 	wtableview.h \
X+ 	wtabledelegates.h 
X+ 
X+-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
X++AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
X+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
X+ 
X+-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
X++LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
X+ 	$(top_builddir)/WINGs/libWUtil.la \
X+ 	@XFTLIBS@ @INTLIBS@
X+ 
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Makefile.in x11-wm/windowmaker/files/patch-WINGs__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-WINGs__Makefile.in	2013-01-14 19:07:52.000000000 +0900
X@@ -0,0 +1,32 @@
X+--- WINGs/Makefile.in.orig
X++++ WINGs/Makefile.in
X+@@ -76,8 +76,7 @@
X+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
X+ 	"$(DESTDIR)$(pkgconfigdir)"
X+ LTLIBRARIES = $(lib_LTLIBRARIES)
X+-libWINGs_la_DEPENDENCIES = libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la
X++libWINGs_la_DEPENDENCIES = libWUtil.la
X+ am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
X+ 	dragdestination.lo dragsource.lo selection.lo wappresource.lo \
X+ 	wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
X+@@ -335,8 +334,8 @@
X+ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
X+ bin_SCRIPTS = get-wings-flags get-wutil-flags
X+ lib_LTLIBRARIES = libWUtil.la libWINGs.la
X+-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
X+-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@
X++LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
X++libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@
X+ libWUtil_la_LIBADD = @LIBBSD@
X+ EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags.in
X+ 
X+@@ -408,7 +407,7 @@
X+ 
X+ AM_CFLAGS = 
X+ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
X+-	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
X++	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
X+ 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
X+ 
X+ pkgconfigdir = $(libdir)/pkgconfig
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in	2013-01-14 19:08:12.000000000 +0900
X@@ -0,0 +1,41 @@
X+--- WINGs/Tests/Makefile.in.orig
X++++ WINGs/Tests/Makefile.in
X+@@ -56,7 +56,6 @@
X+ testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
X+ testmywidget_LDADD = $(LDADD)
X+ testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la
X+ AM_V_lt = $(am__v_lt_$(V))
X+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
X+@@ -65,13 +64,11 @@
X+ wmfile_OBJECTS = wmfile.$(OBJEXT)
X+ wmfile_LDADD = $(LDADD)
X+ wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la
X+ wmquery_SOURCES = wmquery.c
X+ wmquery_OBJECTS = wmquery.$(OBJEXT)
X+ wmquery_LDADD = $(LDADD)
X+ wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la
X+ wtest_SOURCES = wtest.c
X+ wtest_OBJECTS = wtest.$(OBJEXT)
X+@@ -262,14 +259,14 @@
X+ wprefs_bindir = @wprefs_bindir@
X+ wprefs_datadir = @wprefs_datadir@
X+ AUTOMAKE_OPTIONS = 
X+-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
X++LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
X+ 	$(top_builddir)/WINGs/libWUtil.la \
X+ 	@XFTLIBS@ @INTLIBS@
X+ 
X+ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
X+ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
X+ EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
X+-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
X++AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
X+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
X+ 
X+ all: all-am
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in	2013-01-14 19:08:32.000000000 +0900
X@@ -0,0 +1,18 @@
X+--- WPrefs.app/Makefile.in.orig
X++++ WPrefs.app/Makefile.in
X+@@ -347,13 +347,13 @@
X+ 
X+ AM_CFLAGS = 
X+ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
X+-	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
X++	 -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
X+ 
X+ WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
X+ WPrefs_LDADD = \
X+ 	$(top_builddir)/WINGs/libWINGs.la\
X+ 	$(top_builddir)/WINGs/libWUtil.la\
X+-	$(top_builddir)/wrlib/libwraster.la \
X++	-lwraster \
X+ 	@XLFLAGS@ @XLIBS@ \
X+ 	@FCLIBS@ \
X+ 	@INTLIBS@
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-doc__Makefile.in x11-wm/windowmaker/files/patch-doc__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-doc__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-doc__Makefile.in	2013-01-15 22:30:51.000000000 +0900
X@@ -0,0 +1,10 @@
X+--- doc/Makefile.in.orig
X++++ doc/Makefile.in
X+@@ -282,7 +282,6 @@
X+ 	geticonset.1x \
X+ 	getstyle.1x \
X+ 	get-wings-flags.1 \
X+-	get-wraster-flags.1 \
X+ 	get-wutil-flags.1 \
X+ 	seticons.1x \
X+ 	setstyle.1x \
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-src__Makefile.in x11-wm/windowmaker/files/patch-src__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-src__Makefile.in	2013-01-14 19:08:51.000000000 +0900
X@@ -0,0 +1,27 @@
X+--- src/Makefile.in.orig
X++++ src/Makefile.in
X+@@ -72,8 +72,7 @@
X+ 	wmspec.$(OBJEXT) workspace.$(OBJEXT)
X+ wmaker_OBJECTS = $(am_wmaker_OBJECTS)
X+ wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/WINGs/libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la
X++	$(top_builddir)/WINGs/libWUtil.la
X+ AM_V_lt = $(am__v_lt_$(V))
X+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
X+ am__v_lt_0 = --silent
X+@@ -365,13 +364,12 @@
X+ AM_CFLAGS = 
X+ AM_CPPFLAGS = \
X+ 	$(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" \
X+-	-I$(top_srcdir)/wrlib \
X+ 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
X+ 
X+ wmaker_LDADD = \
X+ 	$(top_builddir)/WINGs/libWINGs.la\
X+ 	$(top_builddir)/WINGs/libWUtil.la\
X+-	$(top_builddir)/wrlib/libwraster.la\
X++	-lwraster \
X+ 	@XLFLAGS@ \
X+ 	@LIBXRANDR@ \
X+ 	@LIBXINERAMA@ \
Xdiff -urN /usr/ports/x11-wm/windowmaker/files/patch-util__Makefile.in x11-wm/windowmaker/files/patch-util__Makefile.in
X--- /usr/ports/x11-wm/windowmaker/files/patch-util__Makefile.in	1970-01-01 09:00:00.000000000 +0900
X+++ x11-wm/windowmaker/files/patch-util__Makefile.in	2013-01-14 19:09:18.000000000 +0900
X@@ -0,0 +1,47 @@
X+--- util/Makefile.in.orig
X++++ util/Makefile.in
X+@@ -91,8 +91,7 @@
X+ wmagnify_SOURCES = wmagnify.c
X+ wmagnify_OBJECTS = wmagnify.$(OBJEXT)
X+ wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/WINGs/libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la
X++	$(top_builddir)/WINGs/libWUtil.la
X+ am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
X+ wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
X+ wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
X+@@ -104,8 +103,7 @@
X+ wmsetbg_SOURCES = wmsetbg.c
X+ wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
X+ wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
X+-	$(top_builddir)/WINGs/libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la
X++	$(top_builddir)/WINGs/libWUtil.la
X+ wxcopy_SOURCES = wxcopy.c
X+ wxcopy_OBJECTS = wxcopy.$(OBJEXT)
X+ wxcopy_DEPENDENCIES =
X+@@ -369,7 +367,7 @@
X+ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
X+ EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
X+ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" \
X+-	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
X++	 $(DFLAGS) -I$(top_srcdir)/WINGs \
X+ 	@HEADER_SEARCH_PATH@ \
X+ 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
X+ 
X+@@ -392,13 +390,13 @@
X+ wmagnify_LDADD = \
X+ 	$(top_builddir)/WINGs/libWINGs.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X++	-lwraster \
X+ 	@XLFLAGS@ @XLIBS@ @INTLIBS@
X+ 
X+ wmsetbg_LDADD = \
X+ 	$(top_builddir)/WINGs/libWINGs.la \
X+ 	$(top_builddir)/WINGs/libWUtil.la \
X+-	$(top_builddir)/wrlib/libwraster.la \
X++	-lwraster \
X+ 	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
X+ 
X+ wmgenmenu_LDADD = \
Xdiff -urN /usr/ports/x11-wm/windowmaker/pkg-plist x11-wm/windowmaker/pkg-plist
X--- /usr/ports/x11-wm/windowmaker/pkg-plist	2012-12-30 14:18:16.000000000 +0900
X+++ x11-wm/windowmaker/pkg-plist	2013-01-14 18:57:39.000000000 +0900
X@@ -74,7 +74,6 @@
X GNUstep/Applications/WPrefs.app/tiff/xis.tiff
X bin/convertfonts
X bin/get-wings-flags
X-bin/get-wraster-flags
X bin/get-wutil-flags
X bin/geticonset
X bin/getstyle
X@@ -100,26 +99,20 @@
X include/WINGs/WINGs.h
X include/WINGs/WINGsP.h
X include/WINGs/WUtil.h
X-include/wraster.h
X include/WMaker.h
X lib/libWINGs.a
X lib/libWINGs.la
X lib/libWINGs.so
X lib/libWINGs.so.2
X+lib/libWMaker.a
X+lib/libWMaker.la
X+lib/libWMaker.so
X+lib/libWMaker.so.1
X lib/libWUtil.a
X lib/libWUtil.la
X lib/libWUtil.so
X lib/libWUtil.so.2
X-lib/libwraster.a
X-lib/libwraster.la
X-lib/libwraster.so
X-lib/libwraster.so.4
X-lib/libWMaker.so.1
X-lib/libWMaker.so
X-lib/libWMaker.la
X-lib/libWMaker.a
X libdata/pkgconfig/WINGs.pc
X-libdata/pkgconfig/wrlib.pc
X share/WINGs/Images.tiff
X share/WINGs/Images.xpm
X share/WINGs/defaultIcon.tiff
X@@ -349,19 +342,19 @@
X %%NLS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
X %%NLS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
X %%NLS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
X- at dirrm GNUstep/Applications/WPrefs.app/tiff
X+ at dirrmtry share/locale/hy/LC_MESSAGES
X+ at dirrmtry share/locale/hy
X+ at dirrm share/WindowMaker/Styles
X+ at dirrm share/WindowMaker/Sounds
X+ at dirrm share/WindowMaker/IconSets
X+ at dirrm share/WindowMaker/Backgrounds
X+ at dirrm share/WINGs
X+ at dirrmtry man/sk/man1
X+ at dirrmtry man/sk
X+ at dirrm include/WINGs
X+ at dirrm etc/WindowMaker
X @dirrm GNUstep/Applications/WPrefs.app/xpm
X+ at dirrm GNUstep/Applications/WPrefs.app/tiff
X @dirrm GNUstep/Applications/WPrefs.app
X @dirrm GNUstep/Applications
X @dirrm GNUstep
X- at dirrm etc/WindowMaker
X- at dirrm include/WINGs
X- at dirrm man/sk/man1
X- at dirrm man/sk
X- at dirrmtry share/locale/hy/LC_MESSAGES
X- at dirrmtry share/locale/hy
X- at dirrm share/WINGs
X- at dirrm share/WindowMaker/Backgrounds
X- at dirrm share/WindowMaker/IconSets
X- at dirrm share/WindowMaker/Sounds
X- at dirrm share/WindowMaker/Styles
d5b8ed6cf963cf8f65dced311ababb02
exit

>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list