diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-01-11 12:51:31 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-01-11 12:51:31 +0000 |
| commit | 6aae51b6c6bed4f950fa25b15ef65f22046b90d2 (patch) | |
| tree | 6232801a80e99c7ac83d529429412cd9e62d9eb1 | |
| parent | f41f2099de95074829f9a4a925d7574711edb5c2 (diff) | |
| download | ports-6aae51b6c6bed4f950fa25b15ef65f22046b90d2.tar.gz ports-6aae51b6c6bed4f950fa25b15ef65f22046b90d2.zip | |
Notes
33 files changed, 124 insertions, 117 deletions
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile index d7117886849f..c5f0b55b4bf3 100644 --- a/x11-clocks/alltraxclock/Makefile +++ b/x11-clocks/alltraxclock/Makefile @@ -21,11 +21,10 @@ ALL_TARGET= alltraxclock.so PLIST_FILES= libexec/gkrellm2/plugins/alltraxclock.so WRKSRC= ${WRKDIR}/${PORTNAME}2_0.2/ -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|;s|-O2||;s|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/alltraxclock.so ${PREFIX}/libexec/gkrellm2/plugins/ + ${INSTALL_PROGRAM} ${WRKSRC}/alltraxclock.so ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins/ .include <bsd.port.mk> diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile index 6729e568b045..7fa5b9bb1a68 100644 --- a/x11-clocks/astime/Makefile +++ b/x11-clocks/astime/Makefile @@ -16,8 +16,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xpm-library="${LOCALBASE}/lib" --with-xpm-includes="${LOCALBASE}/include/X11" INSTALL_TARGET= install install.man -MAN1= astime.1 -PLIST_FILES= bin/astime +PLIST_FILES= bin/astime man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/astime/files/patch-aa b/x11-clocks/astime/files/patch-aa index 77fe38216b32..8ec328b726f8 100644 --- a/x11-clocks/astime/files/patch-aa +++ b/x11-clocks/astime/files/patch-aa @@ -1,11 +1,15 @@ ---- autoconf/Makefile.common.in.orig Thu Feb 4 17:44:50 1999 -+++ autoconf/Makefile.common.in Thu Feb 4 17:45:18 1999 -@@ -13,7 +13,7 @@ - $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR) +--- autoconf/Makefile.common.in.orig 1999-05-02 23:12:39.000000000 +0800 ++++ autoconf/Makefile.common.in 2014-01-11 20:25:48.000000000 +0800 +@@ -10,10 +10,10 @@ install: install.bin install.man + + install.bin: $(PROG) + $(STRIP) $(PROG) +- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR) ++ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR) install.man: - $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x -+ $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1 ++ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1 uninstall: $(RMF) $(AFTER_BIN_DIR)/$(PROG) diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile index 24eb4594f523..09eab1ada779 100644 --- a/x11-clocks/astzclock/Makefile +++ b/x11-clocks/astzclock/Makefile @@ -12,10 +12,8 @@ COMMENT= Afterstep clock with some timezone extensions USES= imake USE_XORG= xpm -MAN1= astzclock.1 -PLIST_FILES= bin/astzclock +PLIST_FILES= bin/astzclock man/man1/${PORTNAME}.1.gz -NO_STAGE= yes pre-configure: (cd ${WRKSRC}; \ ${ECHO_CMD} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null) diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile index 5dde72169c65..b5f7b624629d 100644 --- a/x11-clocks/bclock/Makefile +++ b/x11-clocks/bclock/Makefile @@ -13,10 +13,9 @@ COMMENT= Round, analog X11 clock with Bezier curve hands USES= imake USE_XORG= ice sm x11 xext xmu xt -MAN1= bclock.1 PLIST_FILES= bin/bclock \ - lib/X11/app-defaults/Clock-color + lib/X11/app-defaults/Clock-color \ + man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile index 0781c87008dc..7e0439fc7878 100644 --- a/x11-clocks/dclock/Makefile +++ b/x11-clocks/dclock/Makefile @@ -22,16 +22,15 @@ USES= pkgconfig CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXt -lm -MAN1= dclock.1 PORTDOCS= README TODO PLIST_FILES= bin/dclock \ lib/X11/app-defaults/DClock \ + man/man1/${PORTNAME}.1.gz \ %%DATADIR%%/sounds/bell.wav \ %%DATADIR%%/sounds/digital.wav PLIST_DIRS= %%DATADIR%%/sounds \ %%DATADIR%% -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSOX} @@ -57,16 +56,16 @@ do-build: do-install: (cd ${WRKSRC} \ - && ${INSTALL_PROGRAM} dclock ${PREFIX}/bin \ - && ${INSTALL_MAN} dclock.1 ${MANPREFIX}/man/man1 \ + && ${INSTALL_PROGRAM} dclock ${STAGEDIR}${PREFIX}/bin \ + && ${INSTALL_MAN} dclock.1 ${STAGEDIR}${MANPREFIX}/man/man1 \ && ${INSTALL_DATA} Dclock.ad \ - ${PREFIX}/lib/X11/app-defaults/DClock) - @${MKDIR} ${DATADIR}/sounds - (cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.wav ${DATADIR}/sounds) + ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/DClock) + @${MKDIR} ${STAGEDIR}${DATADIR}/sounds + (cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.wav ${STAGEDIR}${DATADIR}/sounds) .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - (cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}) .endfor .endif diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile index 338dad2eb478..10d3fb2b5c58 100644 --- a/x11-clocks/emiclock/Makefile +++ b/x11-clocks/emiclock/Makefile @@ -12,18 +12,14 @@ COMMENT= Hyper-animated face analog clock for X11 USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt -MAN1= emiclock.1 LANGRES= resources/R6/EUC/EmiClock.ad LANGDIR= ${LOCALBASE}/lib/X11/ja_JP.eucJP/app-defaults LANGDIR2= ${LOCALBASE}/lib/X11/ja_JP.EUC/app-defaults EMICLOCKDIR= ${LOCALBASE}/lib/X11/EmiClock -.ifndef NOPORTDOCS PORTDOCS= COPYRIGHT COPYRIGHT.en -.endif -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} != "i386" @@ -32,16 +28,17 @@ PLIST_SUB= SOUND="@comment " PLIST_SUB= SOUND="" .endif +.include <bsd.port.options.mk> + post-install: - @${MKDIR} ${EMICLOCKDIR} - @${MKDIR} ${LANGDIR} - @${MKDIR} ${LANGDIR2} - cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${LANGDIR}/EmiClock - cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${LANGDIR2}/EmiClock -.ifndef NOPORTDOCS - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EMICLOCKDIR} + @${MKDIR} ${STAGEDIR}${LANGDIR} + @${MKDIR} ${STAGEDIR}${LANGDIR2} + cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${STAGEDIR}${LANGDIR}/EmiClock + cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${STAGEDIR}${LANGDIR2}/EmiClock +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -# cd ${WRKSRC}; make install.man .include <bsd.port.post.mk> diff --git a/x11-clocks/emiclock/pkg-plist b/x11-clocks/emiclock/pkg-plist index 571f1ddd7f90..c039dae4f081 100644 --- a/x11-clocks/emiclock/pkg-plist +++ b/x11-clocks/emiclock/pkg-plist @@ -3,6 +3,7 @@ bin/emiclock lib/X11/app-defaults/EmiClock lib/X11/ja_JP.EUC/app-defaults/EmiClock lib/X11/ja_JP.eucJP/app-defaults/EmiClock +man/man1/emiclock.1.gz @dirrmtry lib/X11/ja_JP.eucJP/app-defaults @dirrmtry lib/X11/ja_JP.eucJP @dirrmtry lib/X11/ja_JP.EUC/app-defaults diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile index f9b11be27074..272fdbcbdc38 100644 --- a/x11-clocks/mlclock/Makefile +++ b/x11-clocks/mlclock/Makefile @@ -17,7 +17,6 @@ USE_XORG= x11 xau xdmcp PLIST_FILES= bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji PLIST_DIRS= %%DATADIR%% -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^void main|int main| ; \ @@ -29,10 +28,10 @@ do-build: -L${LOCALBASE}/lib -lX11 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mlclock ${PREFIX}/bin - @${MKDIR} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/mlclock ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} .for i in mlclockrc mlclockrc-kanji - ${INSTALL_DATA} ${WRKSRC}/rcfile/${i} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/rcfile/${i} ${STAGEDIR}${DATADIR} .endfor .include <bsd.port.mk> diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile index 0fe0c8697e9a..def70a5ec464 100644 --- a/x11-clocks/mouseclock/Makefile +++ b/x11-clocks/mouseclock/Makefile @@ -14,11 +14,10 @@ COMMENT= Display the current time using the X root cursor USES= imake:notall USE_XORG= x11 -NO_STAGE= yes post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile index b6436b8227dc..595bf19a93de 100644 --- a/x11-clocks/osdclock/Makefile +++ b/x11-clocks/osdclock/Makefile @@ -19,11 +19,9 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PREFIX="${PREFIX}" -PLIST_FILES= bin/osd_clock -MAN1= osd_clock.1 +PLIST_FILES= bin/osd_clock man/man1/osd_clock.1.gz -NO_STAGE= yes post-install: - ${STRIP_CMD} ${PREFIX}/bin/osd_clock + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/osd_clock .include <bsd.port.mk> diff --git a/x11-clocks/osdclock/files/patch-Makefile b/x11-clocks/osdclock/files/patch-Makefile new file mode 100644 index 000000000000..ddf39b8d0032 --- /dev/null +++ b/x11-clocks/osdclock/files/patch-Makefile @@ -0,0 +1,14 @@ +--- Makefile.orig 2014-01-11 19:21:51.000000000 +0800 ++++ Makefile 2014-01-11 19:22:23.000000000 +0800 +@@ -37,9 +37,8 @@ osd_clock: osd_clock.o + tar: xosd-$(VERSION).tar.gz + + install: all +- $(INSTALL) osd_clock $(BINDIR) +- mkdir -p $(MANDIR)/man1 $(MANDIR)/man3 +- $(INSTALL_DATA) osd_clock.1 $(MANDIR)/man1/ ++ $(INSTALL) osd_clock $(DESTDIR)$(BINDIR) ++ $(INSTALL_DATA) osd_clock.1 $(DESTDIR)$(MANDIR)/man1/ + + clean: + rm -f *~ *.o *.o.pic osd_clock diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile index 131937f5313d..63dcfec05e03 100644 --- a/x11-clocks/swisswatch/Makefile +++ b/x11-clocks/swisswatch/Makefile @@ -13,7 +13,5 @@ COMMENT= Swiss railway clock emulation, and a fancy default appearance USES= imake USE_XORG= ice sm x11 xext xmu xt -MAN1= swisswatch.1 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/swisswatch/pkg-plist b/x11-clocks/swisswatch/pkg-plist index 2bbbff101ebf..f551a91becfa 100644 --- a/x11-clocks/swisswatch/pkg-plist +++ b/x11-clocks/swisswatch/pkg-plist @@ -1,3 +1,4 @@ bin/swisswatch lib/X11/app-defaults/SwissWatch lib/X11/app-defaults/SwissWatch-color +man/man1/swisswatch.1.gz diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile index d77906c061bc..b14873c635d9 100644 --- a/x11-clocks/t3d/Makefile +++ b/x11-clocks/t3d/Makefile @@ -22,8 +22,6 @@ NO_WRKSUBDIR= yes USES= imake USE_XORG= x11 xext -MAN1= t3d.1 -PLIST_FILES= bin/t3d +PLIST_FILES= bin/t3d man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile index 0dea3f5062ed..c85371dea1b9 100644 --- a/x11-clocks/tclock/Makefile +++ b/x11-clocks/tclock/Makefile @@ -15,11 +15,9 @@ COMMENT= Transparent analog clock for x11 NO_WRKSUBDIR= yes USES= imake USE_XORG= x11 xext -MAN1= tclock.1 -PLIST_FILES= bin/tclock +PLIST_FILES= bin/tclock man/man1/${PORTNAME}.1.gz LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/tktz/Makefile b/x11-clocks/tktz/Makefile index fb96933161c9..bfba430e25d7 100644 --- a/x11-clocks/tktz/Makefile +++ b/x11-clocks/tktz/Makefile @@ -10,17 +10,18 @@ MASTER_SITES= http://gromnizki.unixdev.net/soft/ MAINTAINER= gromnizki@unixdev.net COMMENT= A Tcl/Tk-based timezone viewer -RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 - +USES= tk:84+,run NO_BUILD= yes -NO_STAGE= yes +post-patch: + ${REINPLACE_CMD} -e 's|%%TK_VER%%|${TK_VER}|' ${WRKSRC}/tktz + do-install: - @ ${MKDIR} ${PREFIX}/lib/tktz - @ ${INSTALL_SCRIPT} ${WRKSRC}/tktz ${PREFIX}/lib/tktz - @ ${LN} -sf ${PREFIX}/lib/tktz/tktz ${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tktz + ${INSTALL_SCRIPT} ${WRKSRC}/tktz ${STAGEDIR}${PREFIX}/lib/tktz + ${LN} -sf ${PREFIX}/lib/tktz/tktz ${STAGEDIR}${PREFIX}/bin .for file in tktz.help README LICENSE NEWS - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/tktz + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/lib/tktz .endfor .include <bsd.port.mk> diff --git a/x11-clocks/tktz/files/patch-tktz b/x11-clocks/tktz/files/patch-tktz new file mode 100644 index 000000000000..b8f642c57fff --- /dev/null +++ b/x11-clocks/tktz/files/patch-tktz @@ -0,0 +1,11 @@ +--- tktz.orig 2014-01-11 18:51:04.000000000 +0800 ++++ tktz 2014-01-11 18:51:14.000000000 +0800 +@@ -1,7 +1,7 @@ + #!/bin/sh + # -*-tcl-*- \ + # the next line restarts using wish \ +-exec wish8.4 "$0" "$@" ++exec wish%%TK_VER%% "$0" "$@" + + # tktz - timezone viewer. + # diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile index de1b893194b0..f206c10247fd 100644 --- a/x11-clocks/wmbday/Makefile +++ b/x11-clocks/wmbday/Makefile @@ -18,8 +18,4 @@ HAS_CONFIGURE= yes MAKEFILE= BSDmakefile MAKE_ENV+= ${CONFIGURE_ENV} X11BASE=${LOCALBASE} -MAN1= wmbday.1 -MANCOMPRESSED= yes - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/wmbday/pkg-plist b/x11-clocks/wmbday/pkg-plist index ec78c8037b74..b9f30b0dae0c 100644 --- a/x11-clocks/wmbday/pkg-plist +++ b/x11-clocks/wmbday/pkg-plist @@ -1,2 +1,3 @@ @comment $FreeBSD$ bin/wmbday +man/man1/wmbday.1.gz diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile index e5c52671abf9..1a7bf841a49c 100644 --- a/x11-clocks/wmbinclock/Makefile +++ b/x11-clocks/wmbinclock/Makefile @@ -11,16 +11,15 @@ MAINTAINER= logix@foobar.franken.de COMMENT= A binary clock in a windowmaker applet PLIST_FILES= bin/wmBinClock -USE_GMAKE= yes +USES= gmake USE_XORG= xpm -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c @${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \ -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmBinClock ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/wmBinClock ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile index 9bf8158f1b17..3241c791f161 100644 --- a/x11-clocks/wmblueclock/Makefile +++ b/x11-clocks/wmblueclock/Makefile @@ -14,12 +14,10 @@ COMMENT= Simple dockable clock application USE_BZIP2= yes USE_XORG= x11 xau xdmcp xext xpm -MAN1= ${PORTNAME}.1 -PLIST_FILES= bin/wmblueclock +PLIST_FILES= bin/wmblueclock man/man1/${PORTNAME}.1.gz -NO_STAGE= yes do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile index 56bf4ed3d676..3d8d2ec9a194 100644 --- a/x11-clocks/wmcalclock/Makefile +++ b/x11-clocks/wmcalclock/Makefile @@ -15,21 +15,18 @@ LICENSE_FILE= ${WRKSRC}/../COPYING USE_XORG= xpm WRKSRC= ${WRKDIR}/${DISTNAME}/Src -PLIST_FILES= bin/wmCalClock +PLIST_FILES= bin/wmCalClock man/man1/${PORTNAME}.1.gz PORTDOCS= BUGS CHANGES HINTS INSTALL README TODO -MAN1= wmCalClock.1 - OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKDIR}/${DISTNAME} && \ - ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-clocks/wmcalclock/files/patch-Makefile b/x11-clocks/wmcalclock/files/patch-Makefile index da2526f3ff77..ad95d47891af 100644 --- a/x11-clocks/wmcalclock/files/patch-Makefile +++ b/x11-clocks/wmcalclock/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sat Mar 27 15:46:38 1999 -+++ Makefile Sat Aug 12 01:01:35 2000 -@@ -1,8 +1,8 @@ +--- Makefile.orig 1999-03-27 14:46:38.000000000 +0800 ++++ Makefile 2014-01-11 20:07:37.000000000 +0800 +@@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include @@ -9,12 +9,11 @@ +CC ?= gcc +CFLAGS ?= -O2 +INCDIR = -I${LOCALBASE}/include -+DESTDIR= ${PREFIX} +LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext -@@ -15,14 +15,14 @@ +@@ -15,14 +14,14 @@ OBJS = wmCalClock.o \ .c.o: @@ -31,12 +30,12 @@ clean: for i in $(OBJS) ; do \ -@@ -31,6 +31,6 @@ +@@ -31,6 +30,6 @@ clean: rm -f wmCalClock install:: wmCalClock - install -c -s -m 0755 wmCalClock $(DESTDIR)/bin - install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 -+ ${BSD_INSTALL_PROGRAM} wmCalClock $(DESTDIR)/bin -+ ${BSD_INSTALL_MAN} wmCalClock.1 $(DESTDIR)/man/man1 ++ ${BSD_INSTALL_PROGRAM} wmCalClock $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_MAN} wmCalClock.1 $(DESTDIR)$(PREFIX)/man/man1 diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile index fa6fc0923c36..ac2c6e1f4d82 100644 --- a/x11-clocks/wmclock/Makefile +++ b/x11-clocks/wmclock/Makefile @@ -13,11 +13,9 @@ COMMENT= Dockable clock applet for Window Maker USES= imake USE_XORG= xpm -MAN1= wmclock.1 -PLIST_FILES= bin/wmclock +PLIST_FILES= bin/wmclock man/man1/${PORTNAME}.1.gz WMCLOCK_LANG?= english -NO_STAGE= yes pre-configure: (cd ${WRKSRC}; \ ${WRKSRC}/configure --lang ${WMCLOCK_LANG} > /dev/null ) diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile index aa320a55d724..af26ddc23a4a 100644 --- a/x11-clocks/wmclockmon/Makefile +++ b/x11-clocks/wmclockmon/Makefile @@ -14,17 +14,14 @@ USE_XORG= xpm USE_GNOME= gtk12 GNU_CONFIGURE= yes -MAN1= wmclockmon.1 wmclockmon-config.1 wmclockmon-cal.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g' \ ${WRKSRC}/wmclockmon-config/Makefile.in post-install: - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in 1 2 - @${INSTALL_DATA} ${WRKSRC}/doc/sample${i}.wmclockmonrc ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/sample${i}.wmclockmonrc ${STAGEDIR}${EXAMPLESDIR} .endfor .include <bsd.port.mk> diff --git a/x11-clocks/wmclockmon/pkg-plist b/x11-clocks/wmclockmon/pkg-plist index 8887731ea16d..d918c08c2bc6 100644 --- a/x11-clocks/wmclockmon/pkg-plist +++ b/x11-clocks/wmclockmon/pkg-plist @@ -1,6 +1,9 @@ bin/wmclockmon bin/wmclockmon-cal bin/wmclockmon-config +man/man1/wmclockmon-cal.1.gz +man/man1/wmclockmon-config.1.gz +man/man1/wmclockmon.1.gz %%EXAMPLESDIR%%/sample1.wmclockmonrc %%EXAMPLESDIR%%/sample2.wmclockmonrc %%DATADIR%%/backlight0_off.xpm diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile index ea21e2968de6..f129d6a4c3b7 100644 --- a/x11-clocks/wmfishtime/Makefile +++ b/x11-clocks/wmfishtime/Makefile @@ -18,15 +18,13 @@ GTK_CFLAGS?= `${GTK_CONFIG} --cflags` MAKE_ARGS+= CFLAGS="${CPPFLAGS} ${CFLAGS} -Wall ${GTK_CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ GTK_LIBS="${GTK_LIBS}" -PLIST_FILES= bin/wmfishtime -MAN1= wmfishtime.1 +PLIST_FILES= bin/wmfishtime man/man1/${PORTNAME}.1.gz -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -E -e "s@1\.23@1\.24@g" ${WRKSRC}/fishmon.c ${WRKSRC}/wmfishtime.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmfishtime.1 ${PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/wmfishtime ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wmfishtime.1 ${STAGEDIR}${PREFIX}/man/man1/ .include <bsd.port.mk> diff --git a/x11-clocks/wmfuzzy/Makefile b/x11-clocks/wmfuzzy/Makefile index c270e525c02e..925b8a6e0ccd 100644 --- a/x11-clocks/wmfuzzy/Makefile +++ b/x11-clocks/wmfuzzy/Makefile @@ -18,12 +18,11 @@ USE_XORG= xpm PORTDOCS= README PLIST_FILES= bin/wmfuzzy -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmfuzzy ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/wmfuzzy ${STAGEDIR}${PREFIX}/bin .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile index 7da8315542b1..6682fd721172 100644 --- a/x11-clocks/wmtimer/Makefile +++ b/x11-clocks/wmtimer/Makefile @@ -23,12 +23,11 @@ USE_GNOME= gtk20 MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -NO_STAGE= yes do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${STAGEDIR}${PREFIX}/bin .ifndef(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/../README ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile index cc7328b5cfc0..f576b16cb607 100644 --- a/x11-clocks/xdaliclock/Makefile +++ b/x11-clocks/xdaliclock/Makefile @@ -14,8 +14,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/X11 GNU_CONFIGURE= yes USE_XORG= xt sm ice xext x11 -MAN1= xdaliclock.1 -PLIST_FILES= bin/xdaliclock +PLIST_FILES= bin/xdaliclock man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/xdaliclock/files/patch-Makefile.in b/x11-clocks/xdaliclock/files/patch-Makefile.in new file mode 100644 index 000000000000..dd2c139960d3 --- /dev/null +++ b/x11-clocks/xdaliclock/files/patch-Makefile.in @@ -0,0 +1,15 @@ +--- Makefile.in.orig 2014-01-11 19:17:22.000000000 +0800 ++++ Makefile.in 2014-01-11 19:17:41.000000000 +0800 +@@ -79,10 +79,10 @@ install-strip: + install + + install-program: xdaliclock +- $(INSTALL_PROGRAM) xdaliclock $(install_prefix)$(bindir)/xdaliclock ++ $(INSTALL_PROGRAM) xdaliclock $(DESTDIR)$(install_prefix)$(bindir)/xdaliclock + + install-man: xdaliclock.man +- $(INSTALL_DATA) $(srcdir)/xdaliclock.man $(install_prefix)$(man1dir)/xdaliclock.1 ++ $(INSTALL_DATA) $(srcdir)/xdaliclock.man $(DESTDIR)$(install_prefix)$(man1dir)/xdaliclock.1 + + uninstall-program: + rm -f $(install_prefix)$(bindir)/xdaliclock diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile index dff5d0a0c208..d8bb7f17962a 100644 --- a/x11-clocks/xtimer/Makefile +++ b/x11-clocks/xtimer/Makefile @@ -13,8 +13,6 @@ COMMENT= Simple digital timer for X11 USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt -MAN1= xtimer.1 -PLIST_FILES= bin/xtimer +PLIST_FILES= bin/xtimer man/man1/${PORTNAME}.1.gz -NO_STAGE= yes .include <bsd.port.mk> |