aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/ebuttons/Makefile14
-rw-r--r--x11/ebuttons/files/Makefile10
-rw-r--r--x11/ebuttons/pkg-descr3
3 files changed, 8 insertions, 19 deletions
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index e0221bd347c0..b1af8fbbf393 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: E-Buttons 0.2
+# New ports collection makefile for: E-Buttons
# Date created: 30 March 2000
# Whom: jhb
#
@@ -7,6 +7,7 @@
PORTNAME= E-buttons
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.moodfarm.demon.co.uk/download/
EXTRACT_SUFX= .tgz
@@ -14,17 +15,18 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple epplet that contains several buttons used to launch programs
-LIB_DEPENDS= epplet.1:${PORTSDIR}/x11-wm/epplets
+LIB_DEPENDS= epplet.1:${PORTSDIR}/x11-wm/libepplet
WRKSRC= ${WRKDIR}/E-buttons
USE_X_PREFIX= yes
-pre-patch:
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
+CPPFLAGS= -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${X11BASE}/lib -lepplet ${PTHREAD_LIBS}
-pre-build:
- @(cd ${WRKSRC} && ${MAKE} clean)
+do-build:
+ cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o E-Buttons.epplet \
+ ${PORTNAME}.c ${LDFLAGS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/E-Buttons.epplet ${PREFIX}/bin
diff --git a/x11/ebuttons/files/Makefile b/x11/ebuttons/files/Makefile
deleted file mode 100644
index 8066ac80978e..000000000000
--- a/x11/ebuttons/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-LIBS = -L${X11BASE}/lib -lepplet
-CFLAGS += -I${X11BASE}/include
-
-all: E-Buttons.epplet
-
-E-Buttons.epplet: E-buttons.c
- ${CC} ${CFLAGS} ${.ALLSRC} ${LIBS} -o ${.TARGET}
-
-clean:
- rm -f E-Buttons.epplet E-buttons.epplet
diff --git a/x11/ebuttons/pkg-descr b/x11/ebuttons/pkg-descr
index f13d230d0e8f..3802076e357d 100644
--- a/x11/ebuttons/pkg-descr
+++ b/x11/ebuttons/pkg-descr
@@ -2,6 +2,3 @@ A simple epplet for Enlightenment that provides several buttons used to
launch applications. It is modeled on asbutton.
WWW: http://www.moodfarm.demon.co.uk/download/#ebuttons
-
-- John
-jhb@FreeBSD.org