aboutsummaryrefslogtreecommitdiffstats
path: root/japanese
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2006-11-28 06:03:13 +0800
committermiwi <miwi@FreeBSD.org>2006-11-28 06:03:13 +0800
commitf995549048e45b75bfdb88054c7914be39320f8c (patch)
treeb41eda2d4486ee1962b6897f9351c798a4643cd6 /japanese
parent2049b10d1748488b628deb3101e39b54d3b1b141 (diff)
downloadfreebsd-ports-gnome-f995549048e45b75bfdb88054c7914be39320f8c.tar.gz
freebsd-ports-gnome-f995549048e45b75bfdb88054c7914be39320f8c.tar.zst
freebsd-ports-gnome-f995549048e45b75bfdb88054c7914be39320f8c.zip
- Respect X11BASE
PR: ports/105890 Submitted by: trasz
Diffstat (limited to 'japanese')
-rw-r--r--japanese/xyagamo/Makefile3
-rw-r--r--japanese/xyagamo/files/patch-Makefile10
-rw-r--r--japanese/xyagamo/files/patch-src-Makefile18
-rw-r--r--japanese/xyagamo/pkg-plist10
4 files changed, 33 insertions, 8 deletions
diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile
index cf7e9601de7a..c33a4a41a54d 100644
--- a/japanese/xyagamo/Makefile
+++ b/japanese/xyagamo/Makefile
@@ -20,9 +20,6 @@ MAN6= xyagamo.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 --git a/japanese/xyagamo/files/patch-Makefile b/japanese/xyagamo/files/patch-Makefile
new file mode 100644
index 000000000000..6937f21c9350
--- /dev/null
+++ b/japanese/xyagamo/files/patch-Makefile
@@ -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 --git a/japanese/xyagamo/files/patch-src-Makefile b/japanese/xyagamo/files/patch-src-Makefile
new file mode 100644
index 000000000000..67f52d77d88f
--- /dev/null
+++ b/japanese/xyagamo/files/patch-src-Makefile
@@ -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 --git a/japanese/xyagamo/pkg-plist b/japanese/xyagamo/pkg-plist
index cc0486726272..d32026f0b09d 100644
--- a/japanese/xyagamo/pkg-plist
+++ b/japanese/xyagamo/pkg-plist
@@ -20,10 +20,10 @@ lib/X11/xyagamo/images/vstk_2.xpm
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%%