diff options
author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /graphics/libimg/files | |
parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz |
- 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 'graphics/libimg/files')
-rw-r--r-- | graphics/libimg/files/Makefile.bsd | 5 | ||||
-rw-r--r-- | graphics/libimg/files/Makefile.tkstep80 | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/graphics/libimg/files/Makefile.bsd b/graphics/libimg/files/Makefile.bsd index 54d2aa2..310b534 100644 --- a/graphics/libimg/files/Makefile.bsd +++ b/graphics/libimg/files/Makefile.bsd @@ -2,7 +2,6 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.4 .if exists(${LOCALBASE}/lib/tk${TCL_VER}/tkConfig.sh) @@ -20,11 +19,11 @@ TK_STUB_LIB_SPEC= -L${LOCALBASE}/lib -ltkstub${TCL_VER:S/.//} LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ ${TCL_STUB_LIB_SPEC} ${TK_STUB_LIB_SPEC} \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tk${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. -DUSE_TCL_STUBS -DUSE_TK_STUBS CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include diff --git a/graphics/libimg/files/Makefile.tkstep80 b/graphics/libimg/files/Makefile.tkstep80 index a7bfdb7..7788c16 100644 --- a/graphics/libimg/files/Makefile.tkstep80 +++ b/graphics/libimg/files/Makefile.tkstep80 @@ -2,15 +2,14 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.0 LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tkstep${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include |