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 /graphics/libimg | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
Notes
Diffstat (limited to 'graphics/libimg')
| -rw-r--r-- | graphics/libimg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/libimg/files/Makefile.bsd | 5 | ||||
| -rw-r--r-- | graphics/libimg/files/Makefile.tkstep80 | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index c6cf27623a0c..9b40eeedc2e0 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -9,8 +9,7 @@ PORTNAME= libimg PORTVERSION= 1.2.4 PORTREVISION= 4 CATEGORIES?= graphics tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tkimg +MASTER_SITES= SF/tkimg DISTNAME= img${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -54,7 +53,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/libz/*' \ MAKE_ARGS= PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \ MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \ - X11BASE="${X11BASE}" SHLIB_NAME="${SHLIB_NAME}" \ + SHLIB_NAME="${SHLIB_NAME}" \ DIR="${DIR}" USE_LDCONFIG= yes diff --git a/graphics/libimg/files/Makefile.bsd b/graphics/libimg/files/Makefile.bsd index 54d2aa2df294..310b534be74c 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 a7bfdb7f30e8..7788c1607a4c 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 |