aboutsummaryrefslogtreecommitdiff
path: root/x11/xcalib
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2005-10-22 19:58:25 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2005-10-22 19:58:25 +0000
commit4f14e81a93241aab754ff651073bc42478dd8f16 (patch)
tree4554348171555ff1d924231c7fa1e665bf94670b /x11/xcalib
parentd9a8ab5c876504b07d131f783108be1f36f519a9 (diff)
downloadports-4f14e81a93241aab754ff651073bc42478dd8f16.tar.gz
ports-4f14e81a93241aab754ff651073bc42478dd8f16.zip
- respect PREFIX [1]
- respect CFLAGS [2] - nuke files/patch-icclib-Makefile.UNIX [1] - bump PORTREVISION [1] - cleanup [2] PR: 87834 Reported by: pointyhat via kris Submitted by: Petr Holub <hopet@ics.muni.cz> (maintainer) [1] Reworked by: ehaupt [2]
Notes
Notes: svn path=/head/; revision=146134
Diffstat (limited to 'x11/xcalib')
-rw-r--r--x11/xcalib/Makefile23
-rw-r--r--x11/xcalib/files/patch-icclib-Makefile.UNIX11
-rw-r--r--x11/xcalib/pkg-descr3
-rw-r--r--x11/xcalib/pkg-plist3
4 files changed, 17 insertions, 23 deletions
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index a7473b53937e..25a99b660f0f 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcalib
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
@@ -14,19 +15,29 @@ DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= hopet@ics.muni.cz
COMMENT= A program for display calibration of X11-Servers with ICC profiles
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
-USE_GMAKE= yes
-ALL_TARGET= icclib_xcalib
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PORTDOCS= README README.profilers
+
+DEFINES= -DXCALIB_VERSION=\"${PORTVERSION}\" -DUNIX
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lX11 -lXxf86vm -lXext
+CFLAGS+= -I./icclib -I${LOCALBASE}/include -I${X11BASE}/include
+
+do-build:
+ ${CC} ${CFLAGS} ${DEFINES} -c ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}.o
+ ${CC} ${CFLAGS} ${DEFINES} -c ${WRKSRC}/icclib/icc.c -o ${WRKSRC}/icclib/icc.o
+ ${CC} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.o -o ${WRKSRC}/${PORTNAME}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xcalib ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/*.icc ${EXAMPLESDIR}
+
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
-.for FILE in README README.profilers
- ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.for f in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
diff --git a/x11/xcalib/files/patch-icclib-Makefile.UNIX b/x11/xcalib/files/patch-icclib-Makefile.UNIX
deleted file mode 100644
index f438caf4fcdc..000000000000
--- a/x11/xcalib/files/patch-icclib-Makefile.UNIX
+++ /dev/null
@@ -1,11 +0,0 @@
---- icclib/Makefile.UNIX Tue Jan 4 00:31:42 2005
-+++ icclib/Makefile.UNIX.orig Wed Apr 6 11:10:31 2005
-@@ -19,7 +19,7 @@
-
- MAKEU = make
- LIBU = ar -r
--LIBOF = -o
-+LIBOF =
- RANLIB = echo
- AS = as
- CCFLAGSDEF = -DUNIX -c
diff --git a/x11/xcalib/pkg-descr b/x11/xcalib/pkg-descr
index 3d08c601d9bc..3fb82397e997 100644
--- a/x11/xcalib/pkg-descr
+++ b/x11/xcalib/pkg-descr
@@ -12,9 +12,6 @@ from your country/area to:
95100 Selb
GERMANY
-
-The latest version is 0.5 (as of April, 2004)
-
WWW: http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
- Petr
diff --git a/x11/xcalib/pkg-plist b/x11/xcalib/pkg-plist
index 1701229bf8cb..fbd26d6fa0ce 100644
--- a/x11/xcalib/pkg-plist
+++ b/x11/xcalib/pkg-plist
@@ -1,10 +1,7 @@
bin/xcalib
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.profilers
%%EXAMPLESDIR%%/bluish.icc
%%EXAMPLESDIR%%/gamma_1_0.icc
%%EXAMPLESDIR%%/gamma_2_2.icc
%%EXAMPLESDIR%%/gamma_2_2_bright.icc
%%EXAMPLESDIR%%/gamma_2_2_lowContrast.icc
@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%