Date: Sun, 26 Nov 2006 23:40:06 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105890: [PATCH] japanese/xyagamo: respect X11BASE Message-ID: <20061126224006.3CABF39DBA@pin.if.uz.zgora.pl> Resent-Message-ID: <200611262240.kAQMe5hM014336@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105890 >Category: ports >Synopsis: [PATCH] japanese/xyagamo: respect X11BASE >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: Sun Nov 26 22:40:05 GMT 2006 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006 >Description: Respect X11BASE. http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.5-exp.2006101300/ja-xyagamo-0.1b.log Added file(s): - files/patch-Makefile - files/patch-src-Makefile Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xyagamo-0.1b.patch begins here --- diff -ruN --exclude=CVS /usr/ports/japanese/xyagamo/Makefile /home/trasz/xyagamo/Makefile --- /usr/ports/japanese/xyagamo/Makefile Tue May 9 02:18:03 2006 +++ /home/trasz/xyagamo/Makefile Sun Nov 26 23:39:03 2006 @@ -20,9 +20,6 @@ MANLANG= ja MAN6COMPRESSED= no -post-patch: - @${REINPLACE_CMD} -e 's/-lxpg4//' ${WRKSRC}/src/Makefile - pre-build: @cd ${BUILD_WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} depend diff -ruN --exclude=CVS /usr/ports/japanese/xyagamo/files/patch-Makefile /home/trasz/xyagamo/files/patch-Makefile --- /usr/ports/japanese/xyagamo/files/patch-Makefile Thu Jan 1 01:00:00 1970 +++ /home/trasz/xyagamo/files/patch-Makefile Sun Nov 26 23:39:03 2006 @@ -0,0 +1,10 @@ +--- Makefile.orig Sun Nov 26 23:31:17 2006 ++++ Makefile Sun Nov 26 23:31:34 2006 +@@ -1,6 +1,6 @@ + INSTALL = install -c -o root -g wheel + +-X11PREFIX = /usr/X11R6 ++X11PREFIX = $(X11BASE) + + INSTALL_BINDIR = $(X11PREFIX)/bin + INSTALL_LIBDIR = $(X11PREFIX)/lib/X11/xyagamo diff -ruN --exclude=CVS /usr/ports/japanese/xyagamo/files/patch-src-Makefile /home/trasz/xyagamo/files/patch-src-Makefile --- /usr/ports/japanese/xyagamo/files/patch-src-Makefile Thu Jan 1 01:00:00 1970 +++ /home/trasz/xyagamo/files/patch-src-Makefile Sun Nov 26 23:39:03 2006 @@ -0,0 +1,18 @@ +--- src/Makefile.orig Sun Nov 26 23:32:06 2006 ++++ src/Makefile Sun Nov 26 23:32:40 2006 +@@ -1,10 +1,10 @@ +-CC = gcc +-CFLAGS = -g -c -pipe -Wall +-LFLAGS = -g ++#CC = gcc ++CFLAGS += -c ++#LFLAGS = -g + +-X11PREFIX ?= /usr/X11R6 ++X11PREFIX = $(X11BASE) + X11INCL = -I$(X11PREFIX)/include +-X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm -lxpg4 ++X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm + + .ifdef INSTALL_LIBDIR + DEFINE_IMAGEDIR = -DIMAGEDIR=\"$(INSTALL_LIBDIR)/images\" diff -ruN --exclude=CVS /usr/ports/japanese/xyagamo/pkg-plist /home/trasz/xyagamo/pkg-plist --- /usr/ports/japanese/xyagamo/pkg-plist Sun Nov 14 04:58:12 1999 +++ /home/trasz/xyagamo/pkg-plist Sun Nov 26 23:39:03 2006 @@ -20,10 +20,10 @@ lib/X11/xyagamo/images/vstk_3.xpm lib/X11/xyagamo/images/yagamo1.xpm lib/X11/xyagamo/images/yagamo2.xpm -share/doc/xyagamo/00copyright -share/doc/xyagamo/00readme.jp -share/doc/xyagamo/hands.jp -share/doc/xyagamo/rules.jp +%%DOCSDIR%%/00copyright +%%DOCSDIR%%/00readme.jp +%%DOCSDIR%%/hands.jp +%%DOCSDIR%%/rules.jp @dirrm lib/X11/xyagamo/images @dirrm lib/X11/xyagamo -@dirrm share/doc/xyagamo +@dirrm %%DOCSDIR%% --- xyagamo-0.1b.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061126224006.3CABF39DBA>