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 /deskutils/plan | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
- 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)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'deskutils/plan')
| -rw-r--r-- | deskutils/plan/files/patch-Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/deskutils/plan/files/patch-Makefile b/deskutils/plan/files/patch-Makefile index 905fc5a5f302..eef5dceab0d9 100644 --- a/deskutils/plan/files/patch-Makefile +++ b/deskutils/plan/files/patch-Makefile @@ -64,7 +64,7 @@ NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -+FBSD_C = -ansi -I$(X11BASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ ++FBSD_C = -ansi -I$(LOCALBASE)/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ -DNO_MOTIF -DSTDLIBMALLOC @@ -76,9 +76,9 @@ -FBSD_L2 = -L/usr/X11R6/lib -lc -OBSD_L1 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11 -OBSD_L2 = -lc -+FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++FBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +FBSD_L2 = -+OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext ++OBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext +OBSD_L2 = LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc @@ -106,11 +106,11 @@ SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure -LDIR = /usr/X11R6/lib -+LDIR = $(X11BASE)/lib ++LDIR = $(LOCALBASE)/lib BINDIR = plan-$(VERSION) gMYCC = gcc -gCF = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -+gCF = -I$(X11BASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ++gCF = -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11 gL2F = -lc - + |