Date: Fri, 4 Aug 2006 19:17:40 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/101362: [MAINTAINER] astro/sunclock: fix building on pointyhat Message-ID: <20060804151740.7717C12242@fonon.realnet> Resent-Message-ID: <200608041520.k74FKHlx023323@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101362 >Category: ports >Synopsis: [MAINTAINER] astro/sunclock: fix building on pointyhat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 04 15:20:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD >Description: - Fix pointyhat building (it strange, but it doesn't build there. Fixed by adding includepaths explicitly) - Fix permissions by replacing 'cp's and 'install's by BSD_INSTALL_XXX equivalents The following files was added: - files/patch-editkit_Imakefile >How-To-Repeat: >Fix: --- sunclock-3.55_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/astro/sunclock/Makefile /var/tmp/sunclock/Makefile --- /usr/ports/astro/sunclock/Makefile Fri Jul 28 10:20:50 2006 +++ /var/tmp/sunclock/Makefile Fri Aug 4 19:15:31 2006 @@ -8,6 +8,7 @@ PORTNAME= sunclock PORTVERSION= 3.55 +PORTREVISION= 1 CATEGORIES= astro x11-clocks MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \ http://mbsd.msk.ru/dist/ @@ -21,7 +22,8 @@ USE_BZIP2= yes USE_XPM= yes USE_IMAKE= yes -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include MAN1= sunclock.1 diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-Imakefile /var/tmp/sunclock/files/patch-Imakefile --- /usr/ports/astro/sunclock/files/patch-Imakefile Fri Jul 28 10:20:50 2006 +++ /var/tmp/sunclock/files/patch-Imakefile Fri Aug 4 19:11:08 2006 @@ -1,5 +1,5 @@ --- Imakefile.orig Sun Jun 18 23:58:50 2006 -+++ Imakefile Wed Jul 26 14:47:03 2006 ++++ Imakefile Fri Aug 4 19:11:06 2006 @@ -1,18 +1,18 @@ XCOMM Should install to /usr or /usr/local ?? -DESTDIR=/usr @@ -23,7 +23,7 @@ XCOMM XCOMM Compile options: -@@ -42,13 +42,13 @@ +@@ -42,13 +42,12 @@ #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" # Solaris, Linux @@ -39,12 +39,11 @@ +JLIBDIR=-L${LOCALBASE}/lib +ZLIBDIR=-L${LOCALBASE}/lib +JINC=-I${LOCALBASE}/include -+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -+INCLUDES+= -I${LOCALBASE}/include ++CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib #endif SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \ -@@ -56,7 +56,7 @@ +@@ -56,7 +55,7 @@ OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \ readvmf.o readxpm.o readgif.o readjpeg.o readpng.o LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \ @@ -53,7 +52,7 @@ DEPLIBS= # I don't know what I'm doing, and I hate imake! ComplexProgramTarget(sunclock) -@@ -64,7 +64,7 @@ +@@ -64,7 +63,7 @@ all:: cd editkit ; xmkmf ; make emx \ DESTDIR=$(DESTDIR) \ @@ -62,13 +61,23 @@ MANDIR=$(SHAREDIR)/editkit \ SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit -@@ -78,8 +78,7 @@ - cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n +@@ -74,14 +73,13 @@ + + install:: install.man + $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n +- cp -f Sunclockrc $(DESTDIR)$(SHAREDIR) +- cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n ++ ${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR) ++ cd i18n ; rm -f *~ ; ${BSD_INSTALL_DATA} Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf - cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf +- cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf - $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin - install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin -+ install -c -s editkit/emx $(DESTDIR)/bin ++ cd vmf ; rm -f *~ ; ${BSD_INSTALL_DATA} * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf ++ ${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit - cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \ +- cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \ ++ cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \ $(DESTDIR)$(SHAREDIR)/editkit + cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc + cat MESSAGE diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-editkit_Imakefile /var/tmp/sunclock/files/patch-editkit_Imakefile --- /usr/ports/astro/sunclock/files/patch-editkit_Imakefile Thu Jan 1 03:00:00 1970 +++ /var/tmp/sunclock/files/patch-editkit_Imakefile Fri Aug 4 19:13:24 2006 @@ -0,0 +1,35 @@ +--- editkit/Imakefile.orig Sat Mar 11 00:11:23 2006 ++++ editkit/Imakefile Fri Aug 4 19:13:21 2006 +@@ -33,7 +33,9 @@ + XCOMM Compile options: + XCOMM + +-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" ++COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -I${X11BASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib ++ ++CCOPTIONS=${COPTS} + + LOCAL_LIBRARIES=$(XLIB) + DEPLIBS= # I don't know what I'm doing, and I hate imake! +@@ -45,7 +47,7 @@ + + x11.o: + ln -sf MANUAL.emacs emx.man +- $(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c ++ $(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c + + install.man:: + if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \ +@@ -55,9 +57,9 @@ + + install:: + mkdir -p $(SHAREDIR) +- cp -f rc.example $(SHAREDIR)/rc.common +- cd $(SHAREDIR); ln -sf rc.common emxrc +- cp -f README $(SHAREDIR) ++ ${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common ++ ${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc ++ ${BSD_INSTALL_DATA} README $(SHAREDIR) + + clean:: + rm -f core *~ emx.man --- sunclock-3.55_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060804151740.7717C12242>