Attachment #69098 for bug #101362

View | Details | Raw Unified | Return to bug 101362
Collapse All | Expand All

Lines 8-13 Link Here

(-)/var/tmp/sunclock/Makefile (-1 / +3 lines)
8		8
9	PORTNAME= sunclock	9	PORTNAME= sunclock
10	PORTVERSION= 3.55	10	PORTVERSION= 3.55
		11	PORTREVISION= 1
11	CATEGORIES= astro x11-clocks	12	CATEGORIES= astro x11-clocks
12	MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \	13	MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
13	http://mbsd.msk.ru/dist/	14	http://mbsd.msk.ru/dist/
Lines 21-27 Link Here
21	USE_BZIP2= yes	22	USE_BZIP2= yes
22	USE_XPM= yes	23	USE_XPM= yes
23	USE_IMAKE= yes	24	USE_IMAKE= yes
24	CFLAGS+= -I${LOCALBASE}/include	25	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
		26	CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
25		27
26	MAN1= sunclock.1	28	MAN1= sunclock.1
27		29




--- Imakefile.orig	Sun Jun 18 23:58:50 2006
+++ Imakefile	Fri Aug  4 19:11:06 2006
@@ -1,18 +1,18 @@
 XCOMM Should install to /usr or /usr/local ??
-DESTDIR=/usr

 
 XCOMM
 XCOMM Compile options:
@@ -42,13 +42,12 @@
 #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
 
 # Solaris, Linux

+JLIBDIR=-L${LOCALBASE}/lib
+ZLIBDIR=-L${LOCALBASE}/lib
+JINC=-I${LOCALBASE}/include
+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib
+INCLUDES+=	-I${LOCALBASE}/include
 #endif
 
 SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
@@ -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 \

 DEPLIBS=		# I don't know what I'm doing, and I hate imake!
 
 ComplexProgramTarget(sunclock)
@@ -64,7 +63,7 @@
 all::
 	cd editkit ; xmkmf ; make emx \
           DESTDIR=$(DESTDIR) \

 	  MANDIR=$(SHAREDIR)/editkit \
 	  SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
 
@@ -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
-	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
-	install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/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 ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
 		$(DESTDIR)$(SHAREDIR)/editkit
 	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
 	cat MESSAGE




--- 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

Return to bug 101362

Lines 1-5 Link Here

(-)/var/tmp/sunclock/files/patch-Imakefile (-11 / +20 lines)
1	--- Imakefile.orig Sun Jun 18 23:58:50 2006	1	--- Imakefile.orig Sun Jun 18 23:58:50 2006
2	+++ Imakefile Wed Jul 26 14:47:03 2006	2	+++ Imakefile Fri Aug 4 19:11:06 2006
3	@@ -1,18 +1,18 @@	3	@@ -1,18 +1,18 @@
4	XCOMM Should install to /usr or /usr/local ??	4	XCOMM Should install to /usr or /usr/local ??
5	-DESTDIR=/usr	5	-DESTDIR=/usr
Lines 23-29 Link Here
23		23
24	XCOMM	24	XCOMM
25	XCOMM Compile options:	25	XCOMM Compile options:
26	@@ -42,13 +42,13 @@	26	@@ -42,13 +42,12 @@
27	#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"	27	#CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
28		28
29	# Solaris, Linux	29	# Solaris, Linux
Lines 39-50 Link Here
39	+JLIBDIR=-L${LOCALBASE}/lib	39	+JLIBDIR=-L${LOCALBASE}/lib
40	+ZLIBDIR=-L${LOCALBASE}/lib	40	+ZLIBDIR=-L${LOCALBASE}/lib
41	+JINC=-I${LOCALBASE}/include	41	+JINC=-I${LOCALBASE}/include
42	+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include	42	+CCOPTIONS=-DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include -I${X11BASE}/include -L${LOCALBASE}/lib -L${X11BASE}/lib
43	+INCLUDES+= -I${LOCALBASE}/include
44	#endif	43	#endif
45		44
46	SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \	45	SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
47	@@ -56,7 +56,7 @@	46	@@ -56,7 +55,7 @@
48	OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \	47	OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
49	readvmf.o readxpm.o readgif.o readjpeg.o readpng.o	48	readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
50	LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \	49	LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
Lines 53-59 Link Here
53	DEPLIBS= # I don't know what I'm doing, and I hate imake!	52	DEPLIBS= # I don't know what I'm doing, and I hate imake!
54		53
55	ComplexProgramTarget(sunclock)	54	ComplexProgramTarget(sunclock)
56	@@ -64,7 +64,7 @@	55	@@ -64,7 +63,7 @@
57	all::	56	all::
58	cd editkit ; xmkmf ; make emx \	57	cd editkit ; xmkmf ; make emx \
59	DESTDIR=$(DESTDIR) \	58	DESTDIR=$(DESTDIR) \
Lines 62-74 Link Here
62	MANDIR=$(SHAREDIR)/editkit \	61	MANDIR=$(SHAREDIR)/editkit \
63	SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit	62	SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
64		63
65	@@ -78,8 +78,7 @@	64	@@ -74,14 +73,13 @@
66	cd i18n ; rm -f ~ ; cp -f Sunclock. $(DESTDIR)$(SHAREDIR)/i18n	65
		66	install:: install.man
		67	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/i18n
		68	- cp -f Sunclockrc $(DESTDIR)$(SHAREDIR)
		69	- cd i18n ; rm -f ~ ; cp -f Sunclock. $(DESTDIR)$(SHAREDIR)/i18n
		70	+ ${BSD_INSTALL_DATA} Sunclockrc $(DESTDIR)$(SHAREDIR)
		71	+ cd i18n ; rm -f ~ ; ${BSD_INSTALL_DATA} Sunclock. $(DESTDIR)$(SHAREDIR)/i18n
67	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf	72	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
68	cd vmf ; rm -f ~ ; cp -f $(DESTDIR)$(SHAREDIR)/earthmaps/vmf	73	- cd vmf ; rm -f ~ ; cp -f $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
69	- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin	74	- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
70	- install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin	75	- install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
71	+ install -c -s editkit/emx $(DESTDIR)/bin	76	+ cd vmf ; rm -f ~ ; ${BSD_INSTALL_DATA} $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
		77	+ ${BSD_INSTALL_PROGRAM} editkit/emx $(DESTDIR)/bin
72	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit	78	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
73	cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \	79	- cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
		80	+ cd editkit ; ${BSD_INSTALL_DATA} rc.example README MANUAL.emacs \
74	$(DESTDIR)$(SHAREDIR)/editkit	81	$(DESTDIR)$(SHAREDIR)/editkit
		82	cd $(DESTDIR)$(SHAREDIR)/editkit ; mv -f rc.example emxrc
		83	cat MESSAGE

Line 0 Link Here

(-)/var/tmp/sunclock/files/patch-editkit_Imakefile (+35 lines)
	1	--- editkit/Imakefile.orig Sat Mar 11 00:11:23 2006
	2	+++ editkit/Imakefile Fri Aug 4 19:13:21 2006
	3	@@ -33,7 +33,9 @@
	4	XCOMM Compile options:
	5	XCOMM
	6
	7	-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
	8	+COPTS = -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -I${LOCALBASE}/include -I${X11BASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib
	9	+
	10	+CCOPTIONS=${COPTS}
	11
	12	LOCAL_LIBRARIES=$(XLIB)
	13	DEPLIBS= # I don't know what I'm doing, and I hate imake!
	14	@@ -45,7 +47,7 @@
	15
	16	x11.o:
	17	ln -sf MANUAL.emacs emx.man
	18	- $(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
	19	+ $(CC) $(COPTS) ${CFLAGS} -DEMACS -o x11.o -c x11.c
	20
	21	install.man::
	22	if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
	23	@@ -55,9 +57,9 @@
	24
	25	install::
	26	mkdir -p $(SHAREDIR)
	27	- cp -f rc.example $(SHAREDIR)/rc.common
	28	- cd $(SHAREDIR); ln -sf rc.common emxrc
	29	- cp -f README $(SHAREDIR)
	30	+ ${BSD_INSTALL_DATA} rc.example $(SHAREDIR)/rc.common
	31	+ ${BSD_INSTALL_DATA} $(SHAREDIR); ln -sf rc.common emxrc
	32	+ ${BSD_INSTALL_DATA} README $(SHAREDIR)
	33
	34	clean::
	35	rm -f core *~ emx.man