Attachment #72948 for bug #105890

View | Details | Raw Unified | Return to bug 105890
Collapse All | Expand All

Lines 20-28 Link Here

(-)/home/trasz/xyagamo/Makefile (-3 lines)
20	MANLANG= ja	20	MANLANG= ja
21	MAN6COMPRESSED= no	21	MAN6COMPRESSED= no
22		22
23	post-patch:
24	@${REINPLACE_CMD} -e 's/-lxpg4//' ${WRKSRC}/src/Makefile
25
26	pre-build:	23	pre-build:
27	@cd ${BUILD_WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} depend	24	@cd ${BUILD_WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} depend
28		25

Line 0 Link Here

(-)/home/trasz/xyagamo/files/patch-Makefile (+10 lines)
	1	--- Makefile.orig Sun Nov 26 23:31:17 2006
	2	+++ Makefile Sun Nov 26 23:31:34 2006
	3	@@ -1,6 +1,6 @@
	4	INSTALL = install -c -o root -g wheel
	5
	6	-X11PREFIX = /usr/X11R6
	7	+X11PREFIX = $(X11BASE)
	8
	9	INSTALL_BINDIR = $(X11PREFIX)/bin
	10	INSTALL_LIBDIR = $(X11PREFIX)/lib/X11/xyagamo




--- 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\"

Lines 20-29 Link Here

(-)/home/trasz/xyagamo/pkg-plist (-5 / +5 lines)
20	lib/X11/xyagamo/images/vstk_3.xpm	20	lib/X11/xyagamo/images/vstk_3.xpm
21	lib/X11/xyagamo/images/yagamo1.xpm	21	lib/X11/xyagamo/images/yagamo1.xpm
22	lib/X11/xyagamo/images/yagamo2.xpm	22	lib/X11/xyagamo/images/yagamo2.xpm
23	share/doc/xyagamo/00copyright	23	%%DOCSDIR%%/00copyright
24	share/doc/xyagamo/00readme.jp	24	%%DOCSDIR%%/00readme.jp
25	share/doc/xyagamo/hands.jp	25	%%DOCSDIR%%/hands.jp
26	share/doc/xyagamo/rules.jp	26	%%DOCSDIR%%/rules.jp
27	@dirrm lib/X11/xyagamo/images	27	@dirrm lib/X11/xyagamo/images
28	@dirrm lib/X11/xyagamo	28	@dirrm lib/X11/xyagamo
29	@dirrm share/doc/xyagamo	29	@dirrm %%DOCSDIR%%

Return to bug 105890

Line 0 Link Here

(-)/home/trasz/xyagamo/files/patch-src-Makefile (+18 lines)
	1	--- src/Makefile.orig Sun Nov 26 23:32:06 2006
	2	+++ src/Makefile Sun Nov 26 23:32:40 2006
	3	@@ -1,10 +1,10 @@
	4	-CC = gcc
	5	-CFLAGS = -g -c -pipe -Wall
	6	-LFLAGS = -g
	7	+#CC = gcc
	8	+CFLAGS += -c
	9	+#LFLAGS = -g
	10
	11	-X11PREFIX ?= /usr/X11R6
	12	+X11PREFIX = $(X11BASE)
	13	X11INCL = -I$(X11PREFIX)/include
	14	-X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm -lxpg4
	15	+X11LIBS = -L$(X11PREFIX)/lib -lX11 -lXpm
	16
	17	.ifdef INSTALL_LIBDIR
	18	DEFINE_IMAGEDIR = -DIMAGEDIR=\"$(INSTALL_LIBDIR)/images\"