diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile index fd556be14d81..be370986408a 100644 --- a/misc/wmcp/Makefile +++ b/misc/wmcp/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: wmcp -# Version required: 1.2.6 +# Version required: 1.2.8 # Date created: 10 February 1999 # Whom: Jim Mock # -# $Id: Makefile,v 1.1.1.1 1999/03/30 18:46:36 taoka Exp $ +# $Id: Makefile,v 1.2 1999/05/09 16:56:14 steve Exp $ # -DISTNAME= wmcp-1.2.6 +DISTNAME= wmcp-1.2.8 CATEGORIES= misc windowmaker MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/ @@ -17,15 +17,13 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_GMAKE= yes USE_X_PREFIX= yes -.include - pre-build: (cd ${WRKSRC} && ${GMAKE} clean) do-build: - (cd ${WRKSRC} && make) + (cd ${WRKSRC} && ${GMAKE}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmcp ${PREFIX}/bin -.include +.include diff --git a/misc/wmcp/distinfo b/misc/wmcp/distinfo index fa51de18ed51..06f4eb9ff4df 100644 --- a/misc/wmcp/distinfo +++ b/misc/wmcp/distinfo @@ -1 +1 @@ -MD5 (wmcp-1.2.6.tar.gz) = 384736be9178d92e02c87c55bd290150 +MD5 (wmcp-1.2.8.tar.gz) = 6f347dd6fb0b017de868081088cdcf13 diff --git a/misc/wmcp/files/patch-aa b/misc/wmcp/files/patch-aa index 60aa9ba1d268..2d916b22a8e0 100644 --- a/misc/wmcp/files/patch-aa +++ b/misc/wmcp/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 9 23:16:16 1999 -+++ Makefile Tue Feb 9 23:16:34 1999 +--- Makefile.orig Thu May 27 00:17:20 1999 ++++ Makefile Tue Jun 29 10:07:22 1999 @@ -1,6 +1,6 @@ @@ -8,3 +8,16 @@ LIBINC =-L/usr/X11R6/lib -L/usr/include/lib LIBS = -lm -lX11 -lXpm -lXext +@@ -31,10 +31,10 @@ + ################################################################### + + ${OBJECTS}: ${SOURCE} +- gcc -g -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o ++ ${CC} ${CFLAGS} -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o + + ${TARGET}: ${OBJECTS} +- gcc -g -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} ++ ${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} + + clean:: + for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile index fd556be14d81..be370986408a 100644 --- a/x11-wm/wmcp/Makefile +++ b/x11-wm/wmcp/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: wmcp -# Version required: 1.2.6 +# Version required: 1.2.8 # Date created: 10 February 1999 # Whom: Jim Mock # -# $Id: Makefile,v 1.1.1.1 1999/03/30 18:46:36 taoka Exp $ +# $Id: Makefile,v 1.2 1999/05/09 16:56:14 steve Exp $ # -DISTNAME= wmcp-1.2.6 +DISTNAME= wmcp-1.2.8 CATEGORIES= misc windowmaker MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/ @@ -17,15 +17,13 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_GMAKE= yes USE_X_PREFIX= yes -.include - pre-build: (cd ${WRKSRC} && ${GMAKE} clean) do-build: - (cd ${WRKSRC} && make) + (cd ${WRKSRC} && ${GMAKE}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmcp ${PREFIX}/bin -.include +.include diff --git a/x11-wm/wmcp/distinfo b/x11-wm/wmcp/distinfo index fa51de18ed51..06f4eb9ff4df 100644 --- a/x11-wm/wmcp/distinfo +++ b/x11-wm/wmcp/distinfo @@ -1 +1 @@ -MD5 (wmcp-1.2.6.tar.gz) = 384736be9178d92e02c87c55bd290150 +MD5 (wmcp-1.2.8.tar.gz) = 6f347dd6fb0b017de868081088cdcf13 diff --git a/x11-wm/wmcp/files/patch-aa b/x11-wm/wmcp/files/patch-aa index 60aa9ba1d268..2d916b22a8e0 100644 --- a/x11-wm/wmcp/files/patch-aa +++ b/x11-wm/wmcp/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 9 23:16:16 1999 -+++ Makefile Tue Feb 9 23:16:34 1999 +--- Makefile.orig Thu May 27 00:17:20 1999 ++++ Makefile Tue Jun 29 10:07:22 1999 @@ -1,6 +1,6 @@ @@ -8,3 +8,16 @@ LIBINC =-L/usr/X11R6/lib -L/usr/include/lib LIBS = -lm -lX11 -lXpm -lXext +@@ -31,10 +31,10 @@ + ################################################################### + + ${OBJECTS}: ${SOURCE} +- gcc -g -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o ++ ${CC} ${CFLAGS} -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o + + ${TARGET}: ${OBJECTS} +- gcc -g -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} ++ ${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} + + clean:: + for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done