diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile index 77adb77816d2..44a55987e1ac 100644 --- a/astro/wmspaceweather/Makefile +++ b/astro/wmspaceweather/Makefile @@ -1,28 +1,28 @@ PORTNAME= wmspaceweather PORTVERSION= 1.04 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro windowmaker MASTER_SITES= https://api.opensuse.org/public/source/openSUSE:Factory/WindowMaker-applets/ \ ftp://ftp.canadatux.org/linux/windowmaker/ DISTNAME= wmSpaceWeather-${PORTVERSION} MAINTAINER= xride@FreeBSD.org COMMENT= DockApp that shows the weather at geosynchronous orbit LICENSE= GPLv2 RUN_DEPENDS= p5-Time-modules>=0:devel/p5-Time-modules USES= shebangfix xorg WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather SHEBANG_FILES= GetKp USE_XORG= x11 xext xpm ALL_TARGET= clean all MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/GetKp bin/wmSpaceWeather \ - man/man1/wmSpaceWeather.1.gz + share/man/man1/wmSpaceWeather.1.gz .include diff --git a/astro/wmspaceweather/files/patch-Makefile b/astro/wmspaceweather/files/patch-Makefile index 6a985e4f4eea..31f5cdb31219 100644 --- a/astro/wmspaceweather/files/patch-Makefile +++ b/astro/wmspaceweather/files/patch-Makefile @@ -1,43 +1,43 @@ --- Makefile.orig 1999-01-04 21:20:45 UTC +++ Makefile @@ -1,8 +1,7 @@ -CC = gcc -CFLAGS = -O2 -Wall -INCDIR = -I/usr/X11R6/include/X11 -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 +INCDIR = -I${LOCALBASE}/include +LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext # for Solaris @@ -12,14 +11,14 @@ OBJS = wmSpaceWeather.o \ .c.o: - $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) + $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) all: wmSpaceWeather.o wmSpaceWeather wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm wmSpaceWeather: $(OBJS) - $(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS) + $(CC) $(CFLAGS) $(SYSTEM) -o wmSpaceWeather $(OBJS) $(LIBDIR) $(LIBS) clean: for i in $(OBJS) ; do \ @@ -28,7 +27,7 @@ clean: rm -f wmSpaceWeather install:: wmSpaceWeather - install -s -m 0755 wmSpaceWeather $(DESTDIR)/bin - install -m 0755 GetKp $(DESTDIR)/bin - install -m 0644 wmSpaceWeather.1 $(DESTDIR)/man/man1 + ${BSD_INSTALL_PROGRAM} wmSpaceWeather $(DESTDIR)$(PREFIX)/bin + ${BSD_INSTALL_SCRIPT} GetKp $(DESTDIR)$(PREFIX)/bin -+ ${BSD_INSTALL_MAN} wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/man/man1 ++ ${BSD_INSTALL_MAN} wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1