Commits

Justin Flude authored and Perry E. Metzger committed f1ac2599a29
xfractint: fix to build against MacPorts Xorg, not XQuartz

Closes: https://trac.macports.org/ticket/58176
No tags

graphics/xfractint/files/patch-prefix-x11-dirs.diff

Modified
1 1 --- xfractint-20.04p14/Makefile.orig 2014-05-03 08:12:33.000000000 -0500
2 -+++ xfractint-20.04p14/Makefile 2019-03-05 16:22:26.000000000 -0600
3 -@@ -20,26 +20,21 @@
2 ++++ xfractint-20.04p14/Makefile 2019-03-07 12:12:05.000000000 -0600
3 +@@ -2,6 +2,8 @@
4 + STRIP = strip
5 + INSTALL = /usr/bin/install
6 +
7 ++PREFIX = $(DESTDIR)__PREFIX__
8 ++
9 + # Architecture
10 + # automatic detection
11 + ARCH = `uname -m | tr "_" "-"`
12 +@@ -20,26 +22,19 @@
4 13
5 14 # Use Xft/fontconfig libraries
6 15 WITHXFT = -DWITH_XFT
7 16 -XFTHFD = /usr/include/freetype2
8 -+XFTHFD = /opt/X11/include/freetype2
17 ++XFTHFD = $(PREFIX)/include/freetype2
9 18 # Or not
10 19 # WITHXFT =
11 20 # XFTHFD =
12 21
13 22 -ifndef PREFIX
14 23 -PREFIX = /usr
15 24 -endif
16 25 -ifndef DESTDIR
17 26 -DESTDIR = $(PREFIX)
18 27 -endif
19 -+PREFIX = $(DESTDIR)__PREFIX__
20 -
28 +-
21 29 # SRCDIR should be a path to the directory that will hold fractint.hlp
22 30 # SRCDIR should also hold the .par, .frm, etc. files
23 31 -SRCDIR = $(DESTDIR)/share/xfractint
24 32 +SRCDIR = $(PREFIX)/share/xfractint
25 33 SHRDIR = $(PREFIX)/share/xfractint
26 34 # BINDIR is where you put your X11 binaries
27 35 -BINDIR = $(DESTDIR)/bin
28 36 +BINDIR = $(PREFIX)/bin
29 37 # MANDIR is where you put your chapter 1 man pages
30 38 -MANDIR = $(DESTDIR)/share/man/man1
31 39 +MANDIR = $(PREFIX)/share/man/man1
32 40
33 41 HFD = ./headers
34 42 UDIR = ./unix
35 43 @@ -140,6 +135,8 @@
36 44
37 45 endif
38 46
39 -+CFLAGS += -I/opt/X11/include
47 ++CFLAGS += -I$(PREFIX)/include/X11
40 48 +
41 49 # Gcc is often the only compiler that works for this
42 50 # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
43 51 # For AIX, maybe use CC = xlc, but other AIX users found cc works, xlc doesn't.
44 52 @@ -147,7 +144,7 @@
45 53 # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc.
46 54 # For Sun Solaris 2.x w/GNU gcc, use CC = gcc
47 55 #CC = gcc
48 56 -CC = /usr/bin/gcc
49 57 +#CC = /usr/bin/gcc
50 58
51 59 # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap
52 60 # For AIX or OSF/1, add -lbsd
53 61 @@ -165,6 +162,8 @@
54 62 LIBS = -L/usr/X11R6/lib -lX11 -lm
55 63 endif
56 64
57 -+LIBS = -L/opt/X11/lib -lX11 -lm
65 ++LIBS = -L$(PREFIX)/lib -lX11 -lm
58 66 +
59 67 ifeq ($(NCURSES),-DNCURSES)
60 68 LIBS += -lncurses
61 69 endif
62 70 @@ -323,7 +322,7 @@
63 71 rm -f common/encoder.o common/help.o common/realdos.o
64 72 rm -f unix/unixscr.o unix/video.o unix/xfcurses.o
65 73 if [ -x xfractint.x11 ] ; then mv -f xfractint.x11 xfractint ; fi
66 74 -
67 75 +

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut