aboutsummaryrefslogtreecommitdiff
path: root/x11-fm
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2010-03-23 21:14:39 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2010-03-23 21:14:39 +0000
commitc6a2501ef2a438d205325e3d382a031aa8486319 (patch)
treee2bedddab94c31b6b603a72007f201b1fd00c442 /x11-fm
parentea074376d39570a02a19abe6cb0a09507466fa0a (diff)
downloadports-c6a2501ef2a438d205325e3d382a031aa8486319.tar.gz
ports-c6a2501ef2a438d205325e3d382a031aa8486319.zip
- Chase x11-toolkits/fltk update
Notes
Notes: svn path=/head/; revision=251412
Diffstat (limited to 'x11-fm')
-rw-r--r--x11-fm/xdiskusage/Makefile27
-rw-r--r--x11-fm/xdiskusage/pkg-plist3
2 files changed, 7 insertions, 23 deletions
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index ac1133a93a34..c477caa80b56 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdiskusage
PORTVERSION= 1.48
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-fm
MASTER_SITES= http://xdiskusage.sourceforge.net/
EXTRACT_SUFX= .tgz
@@ -17,32 +17,19 @@ COMMENT= Show where disk space is taken up
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
-MAN1= xdiskusage.1
USE_GMAKE= yes
-OPTIONS= THREADS "Threads support, necessary with threaded fltk" off
-.include <bsd.port.pre.mk>
+PLIST_FILES= bin/xdiskusage
+MAN1= xdiskusage.1
-.if defined(WITH_THREADS)
-CXXFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LIBS}
-.endif
+post-patch:
+ ${REINPLACE_CMD} -e '22,24d' ${WRKSRC}/Makefile
do-build:
-.for i in panels xdiskusage
- ${CXX} ${CXXFLAGS} -I${LOCALBASE}/include -c \
- ${WRKSRC}/${i}.C -o ${WRKSRC}/${i}.o
-.endfor
- ${CXX} ${CXXFLAGS} -L${LOCALBASE}/lib -o \
- ${WRKSRC}/xdiskusage ${WRKSRC}/panels.o \
- ${WRKSRC}/xdiskusage.o -lfltk -lm -lXext -lX11 ${LDFLAGS}
+ cd ${WRKSRC} && ${GMAKE} CXXFLAGS="`fltk-config --cxxflags`" LDFLAGS="`fltk-config --ldflags`"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xdiskusage ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/xdiskusage.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/xdiskusage/pkg-plist b/x11-fm/xdiskusage/pkg-plist
deleted file mode 100644
index bda9f0e6bcb6..000000000000
--- a/x11-fm/xdiskusage/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/xdiskusage
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%