diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile index 80b29cc7f193..4a97bf470992 100644 --- a/x11-clocks/bclock/Makefile +++ b/x11-clocks/bclock/Makefile @@ -17,4 +17,7 @@ COMMENT= A round, analog X11 clock with bezier curve hands USE_IMAKE= yes MAN1= bclock.1 +PLIST_FILES= bin/bclock \ + lib/X11/app-defaults/Clock-color + .include diff --git a/x11-clocks/bclock/pkg-plist b/x11-clocks/bclock/pkg-plist deleted file mode 100644 index bde6dd0ea783..000000000000 --- a/x11-clocks/bclock/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/bclock -lib/X11/app-defaults/Clock-color diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile index 6b67a82e6fbb..c270e87507b4 100644 --- a/x11-clocks/rclock/Makefile +++ b/x11-clocks/rclock/Makefile @@ -30,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-DMAIL_SPOOL='\"/var/mail/\"'" ALL_TARGET= clock MAN1= rclock.1 +PLIST_FILES= bin/rclock + post-patch: @${REINPLACE_CMD} \ 's|^subdirs =.*$$|subdirs = rclock|g' ${WRKSRC}/Makefile.in diff --git a/x11-clocks/rclock/pkg-plist b/x11-clocks/rclock/pkg-plist deleted file mode 100644 index e751521ea79a..000000000000 --- a/x11-clocks/rclock/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@comment $FreeBSD$ -bin/rclock diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile index 58d69c9b1ec6..4d5a9855f23e 100644 --- a/x11-clocks/wmtz/Makefile +++ b/x11-clocks/wmtz/Makefile @@ -16,12 +16,17 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Dockapp that displays the time in different time zones USE_GMAKE= yes +MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -I${X11BASE}/include" \ + LIBDIR="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/wmtz USE_X_PREFIX= yes USE_XPM= yes MAN1= wmtz.1 +PLIST_FILES= bin/wmtz \ + etc/wmtzrc.default -post-install: +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${X11BASE}/bin/wmtz @${INSTALL_MAN} ${WRKSRC}/wmtz.1 ${PREFIX}/man/man1/ @${ECHO} "===> Installing wmtzrc.default in ${PREFIX}/etc." @${ECHO} "===> Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it." diff --git a/x11-clocks/wmtz/files/patch-aa b/x11-clocks/wmtz/files/patch-aa deleted file mode 100644 index b1b8cb66ddb4..000000000000 --- a/x11-clocks/wmtz/files/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ ---- Makefile.orig Sat Apr 21 20:12:15 2001 -+++ Makefile Sat Apr 21 20:15:23 2001 -@@ -1,7 +1,7 @@ --CC = gcc --LIBDIR = -L/usr/X11R6/lib -+CC ?= gcc -+LIBDIR = -L${X11BASE}/lib - LIBS = -lXpm -lXext -lX11 -lm --FLAGS = -O2 -+CFLAGS ?= -Wall -O2 - DESTDIR = /usr/local - OBJS = wmtz.o \ - ../wmgeneral/wmgeneral.o \ -@@ -10,10 +10,10 @@ - - - .c.o: -- $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o -+ $(CC) -I${X11BASE}/include $(CFLAGS) -c $< -o $*.o - - wmtz: $(OBJS) -- $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS) -+ $(CC) $(CFLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS) - - all:: wmtz - -@@ -25,22 +25,4 @@ - rm -f *~ - - install:: wmtz -- cp -f wmtz $(DESTDIR)/bin/ -- chmod 755 $(DESTDIR)/bin/wmtz -- chown root:root $(DESTDIR)/bin/wmtz -- cp -f wmtz.1 $(DESTDIR)/man/man1 -- chmod 644 $(DESTDIR)/man/man1/wmtz.1 -- chown root:root $(DESTDIR)/man/man1/wmtz.1 -- cp -f wmtzrc $(HOME)/.wmtzrc -- chmod 600 $(HOME)/.wmtzrc -- cp -f wmtzrc /etc/wmtzrc -- chmod 644 /etc/wmtzrc -- chown root:root /etc/wmtzrc -- @echo "wmtz: Installation finished..." -- --uninstall:: -- rm -i /usr/local/bin/wmtz -- rm -i /etc/wmtzrc -- chmod 666 $(HOME)/.wmtzrc -- rm -i $(HOME)/.wmtzrc -- @echo "wmtz: Uninstall completed..." -+ @/usr/bin/install -c -o 0 -g 0 -s -m 755 wmtz ${X11BASE}/bin/wmtz diff --git a/x11-clocks/wmtz/pkg-plist b/x11-clocks/wmtz/pkg-plist deleted file mode 100644 index 214172e564ef..000000000000 --- a/x11-clocks/wmtz/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/wmtz -etc/wmtzrc.default