diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /japanese/xjtext/files/patch-aa | |
| parent | Update to version 2.2.6 (diff) | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'japanese/xjtext/files/patch-aa')
| -rw-r--r-- | japanese/xjtext/files/patch-aa | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/japanese/xjtext/files/patch-aa b/japanese/xjtext/files/patch-aa index 98c017fe971c..bca9e7b51509 100644 --- a/japanese/xjtext/files/patch-aa +++ b/japanese/xjtext/files/patch-aa @@ -6,12 +6,12 @@ -INCDIRS =-I/usr/X11R6/include -I/usr/local/include +CC =${CXX} +CFLAGS =${CXXFLAGS} -c -+INCDIRS =-I${X11BASE}/include `imlib-config --cflags` ++INCDIRS =-I${LOCALBASE}/include `imlib-config --cflags` LIBS =-lX11 -lXext -lm -lfl -IMLIBS =-ljpeg -lpng -ltiff -lz -lgif -lImlib -LIBDIRS =-L/usr/X11R6/lib/ -L/usr/local/lib +IMLIBS =`imlib-config --libs` -+LIBDIRS =-L${X11BASE}/lib ++LIBDIRS =-L${LOCALBASE}/lib OBJS =xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o all: xjtext @@ -20,7 +20,7 @@ xjtext: ${OBJS} - LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -+ LD_RUN_PATH=${X11BASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ ++ LD_RUN_PATH=${LOCALBASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\ -o xjtext clean: |