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 /ports-mgmt | |
| 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 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pib/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | ports-mgmt/qtpkg/files/patch-Makefile | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/ports-mgmt/pib/files/patch-Makefile b/ports-mgmt/pib/files/patch-Makefile index e56a5d061776..638889566178 100644 --- a/ports-mgmt/pib/files/patch-Makefile +++ b/ports-mgmt/pib/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Oct 28 10:55:08 2000 -+++ Makefile Thu Mar 15 20:10:02 2007 +--- Makefile.orig 2000-10-28 10:55:08.000000000 +0200 ++++ Makefile 2008-04-12 14:19:18.000000000 +0200 @@ -8,13 +8,12 @@ X11BASE?= /usr/X11R6 @@ -15,12 +15,14 @@ .endif SRCS= tkXAccess.c -@@ -25,7 +24,7 @@ +@@ -25,8 +24,8 @@ PAXFILES= ${SRCS} ${TCL_SRCS} ${HDRS} ${OTHER} PAXNAME= pib-1.1 -CFLAGS+= -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 \ +- -I${X11BASE}/include \ +CFLAGS+= -I${PREFIX}/include/tcl8.4 -I${PREFIX}/include/tk8.4 \ - -I${X11BASE}/include \ ++ -I${LOCALBASE}/include \ -DUSE_XACCESS -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 \ -DSTDC_HEADERS=1 -DTK_FILE_COUNT=_r -DNEED_MATHERR=1 \ + -DTK_LIBRARY=\"${PREFIX}/lib/tk8.2\" diff --git a/ports-mgmt/qtpkg/files/patch-Makefile b/ports-mgmt/qtpkg/files/patch-Makefile index 155585330057..5272cfec9295 100644 --- a/ports-mgmt/qtpkg/files/patch-Makefile +++ b/ports-mgmt/qtpkg/files/patch-Makefile @@ -12,14 +12,14 @@ $FreeBSD$ -INCPATH = -I/usr/local/include -I/usr/X11R6/include/qt2 +CFLAGS += -pipe -Wall -W -DNO_DEBUG +CXXFLAGS += ${CFLAGS} -+INCPATH = -I$(LOCALBASE)/include -I$(X11BASE)/include/ ++INCPATH = -I$(LOCALBASE)/include LINK = c++ -LIBS = $(SUBLIBS) -L/usr/local/lib -L/usr/X11R6/lib -lqt2 -lXext -lX11 -lm -MOC = /usr/X11R6/bin/moc2 -UIC = /usr/X11R6/bin/uic -+LIBS += $(SUBLIBS) -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lXext -lX11 -lm -+MOC = $(X11BASE)/bin/moc -+UIC = $(X11BASE)/bin/uic ++LIBS += $(SUBLIBS) -L$(LOCALBASE)/lib -lXext -lX11 -lm ++MOC = $(LOCALBASE)/bin/moc ++UIC = $(LOCALBASE)/bin/uic TAR = tar -cf GZIP = gzip -9f |