Attachment #77141 for bug #111133

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

Lines 6-12 Link Here

(-)free-sa/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= free-sa	8	PORTNAME= free-sa
9	PORTVERSION= 1.0.2	9	PORTVERSION= 1.2.0
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 17-22 Link Here
17	USE_GMAKE= yes	17	USE_GMAKE= yes
18		18
19	MAN1= free-sa.1	19	MAN1= free-sa.1
20	MAN5= sa.conf.5	20	MAN5= free-sa.conf.5
21		21
22	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)free-sa/distinfo (-3 / +3 lines)
1	MD5 (free-sa-1.0.2.tar.gz) = 3620fcfbaefacf131ddc71ee5ac2b4be	1	MD5 (free-sa-1.2.0.tar.gz) = 51389ffe0dc4987fb3a3456bd3450da6
2	SHA256 (free-sa-1.0.2.tar.gz) = 85946909e4366f8567db3ef23e1ff1aca03422ff9be98ca942d84d3be8b9a8e2	2	SHA256 (free-sa-1.2.0.tar.gz) = f3a003c7412c5d351338a1a97173009ff124814b9231ad16889ce97a17151fbe
3	SIZE (free-sa-1.0.2.tar.gz) = 44743	3	SIZE (free-sa-1.2.0.tar.gz) = 51543




--- Makefile.orig	Mon Apr  2 14:45:41 2007
+++ Makefile	Mon Apr  2 14:46:20 2007
@@ -14,11 +14,9 @@
 install:
 	$(MAKEDIRS)
 	@(										\
-	$(INSTALLDIR) $(PREFIX);							\
-	$(INSTALLDIR) $(PREFIX)/doc;							\
-	$(INSTALLDIR) $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION);			\
+	$(INSTALLDIR) $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION);			\
 	$(INSTALLODR) $(TMPDIR);							\
 	for IDOCFILE in COPYING ChangeLog FAQ INSTALL README README.DEV TRANSLATIONS; do\
-	    $(INSTALLFIL) $$IDOCFILE $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION);		\
+	    $(INSTALLFIL) $$IDOCFILE $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION);		\
 	done										\
 	)
-OPTIM = -pipe -O3 -march=$(MARCH) -fomit-frame-pointer
-
 # Warnings flags
 WARNS = -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 	-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual
@@ -48,7 +45,7 @@
        -DPROGNAME=\"$(PROGNAME)\" -DPROGVERSION=\"$(PROGVERSION)\" -DPROGURL=\"$(PROGURL)\"
 
 # All compiling flags
-CFLAGS = $(OPTIM) -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
+CFLAGS += -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
 
 # All linking flags
 LDFLAGS += $(LIBS) $(CFLAGS)




bin/free-sa
etc/free-sa/downloads-archives.sample
etc/free-sa/downloads-cddvd.sample
etc/free-sa/downloads-office.sample
etc/free-sa/downloads-audio.sample
etc/free-sa/downloads-code.sample
etc/free-sa/downloads-video.sample
etc/free-sa/downloads.sample
etc/free-sa/free-sa.conf.sample
share/free-sa/Russian.KOI8-R
share/free-sa/RussianMail.KOI8-R
share/free-sa/German.UTF8
share/free-sa/GermanMail.UTF8
share/free-sa/Czech.ISO8859-2
share/free-sa/CzechMail.ISO8859-2
share/free-sa/Belarusian.CP1251
share/free-sa/BelarusianMail.CP1251
share/free-sa/English.ISO8859-1
share/free-sa/EnglishMail.ISO8859-1
share/free-sa/Estonian.UTF8
share/free-sa/EstonianMail.UTF8
share/free-sa/Italian.ISO8859-1
share/free-sa/ItalianMail.ISO8859-1
share/free-sa/Slovak.UTF8
share/free-sa/SlovakMail.UTF8
share/doc/free-sa-1.2.0/COPYING
share/doc/free-sa-1.2.0/INSTALL
share/doc/free-sa-1.2.0/README
share/doc/free-sa-1.2.0/README.DEV
share/doc/free-sa-1.2.0/ChangeLog     
share/doc/free-sa-1.2.0/FAQ
share/doc/free-sa-1.2.0/TRANSLATIONS
www/data/free-sa/sa.js
www/data/free-sa/d.png
www/data/free-sa/g.png
www/data/free-sa/gsa.css
www/data/free-sa/lsa.css
www/data/free-sa/rsa.css
www/data/free-sa/themes/default
www/data/free-sa/themes/rbsec/d.png
www/data/free-sa/themes/rbsec/g.png
www/data/free-sa/themes/rbsec/gsa.css
www/data/free-sa/themes/rbsec/lsa.css
www/data/free-sa/themes/rbsec/rsa.css
www/data/free-sa/themes/sarg/d.png
www/data/free-sa/themes/sarg/g.png
www/data/free-sa/themes/sarg/gsa.css
www/data/free-sa/themes/sarg/lsa.css
www/data/free-sa/themes/sarg/rsa.css
www/data/free-sa/themes/silver/d.png
www/data/free-sa/themes/silver/g.png
www/data/free-sa/themes/silver/gsa.css
www/data/free-sa/themes/silver/lsa.css
www/data/free-sa/themes/silver/rsa.css
www/data/free-sa/themes/sa.js
@dirrm etc/free-sa
@dirrm share/free-sa
@dirrm share/doc/free-sa-1.2.0
@dirrm www/data/free-sa/themes/rbsec
@dirrm www/data/free-sa/themes/sarg
@dirrm www/data/free-sa/themes/silver
@dirrm www/data/free-sa/themes
@dirrm www/data/free-sa

Return to bug 111133

Lines 1-30 Link Here

(-)free-sa/files/patch-Makefile (-30 / +16 lines)
1	--- Makefile.orig Thu Mar 22 19:06:58 2007	1	--- Makefile.orig Mon Apr 2 14:45:41 2007
2	+++ Makefile Fri Mar 23 22:21:04 2007	2	+++ Makefile Mon Apr 2 14:46:20 2007
3	@@ -9,7 +9,7 @@	3	@@ -14,11 +14,9 @@
4	# etc dir	4	install:
5	ETCDIR = $(PREFIX)/etc/$(PROGLNAME)	5	$(MAKEDIRS)
6	# where put reports (you can change it later via sa.conf configuration file)	6	@( \
7	-WWWDIR = $(PREFIX)/var/www/htdocs/$(PROGLNAME)	7	- $(INSTALLDIR) $(PREFIX); \
8	+WWWDIR = $(PREFIX)/www/$(PROGLNAME)	8	- $(INSTALLDIR) $(PREFIX)/doc; \
9	# temporary parent dir for sorting (you can change it later via sa.conf configuration file)	9	- $(INSTALLDIR) $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION); \
10	TMPDIR = /tmp	10	+ $(INSTALLDIR) $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION); \
11	# where log file lives (you can change it later via sa.conf configuration file)	11	$(INSTALLODR) $(TMPDIR); \
12	@@ -18,9 +18,6 @@	12	for IDOCFILE in COPYING ChangeLog FAQ INSTALL README README.DEV TRANSLATIONS; do\
13	# C compiler	13	- $(INSTALLFIL) $$IDOCFILE $(PREFIX)/doc/$(PROGLNAME)-$(PROGVERSION); \
14	CC = gcc	14	+ $(INSTALLFIL) $$IDOCFILE $(PREFIX)/share/doc/$(PROGLNAME)-$(PROGVERSION); \
15		15	done \
16	-# Optimisations flags	16	)
17	-OPTIM = -pipe -O3 -march=$(MARCH) -fomit-frame-pointer
18	-
19	# Warnings flags
20	WARNS = -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
21	-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual
22	@@ -48,7 +45,7 @@
23	-DPROGNAME=\"$(PROGNAME)\" -DPROGVERSION=\"$(PROGVERSION)\" -DPROGURL=\"$(PROGURL)\"
24
25	# All compiling flags
26	-CFLAGS = $(OPTIM) -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
27	+CFLAGS += -I. -I.. $(WARNS) $(CSTDF) $(DEFS)
28
29	# All linking flags
30	LDFLAGS += $(LIBS) $(CFLAGS)

Lines 1-40 Link Here

(-)free-sa/pkg-plist (-37 / +60 lines)
1	bin/free-sa	1	bin/free-sa
2	etc/free-sa/downloads	2	etc/free-sa/downloads-archives.sample
3	etc/free-sa/sa.conf	3	etc/free-sa/downloads-cddvd.sample
4	share/free-sa/English	4	etc/free-sa/downloads-office.sample
5	share/free-sa/Russian	5	etc/free-sa/downloads-audio.sample
6	share/free-sa/RussianMail	6	etc/free-sa/downloads-code.sample
7	share/doc/free-sa-1.0.2/COPYING	7	etc/free-sa/downloads-video.sample
8	share/doc/free-sa-1.0.2/INSTALL	8	etc/free-sa/downloads.sample
9	share/doc/free-sa-1.0.2/README	9	etc/free-sa/free-sa.conf.sample
10	share/doc/free-sa-1.0.2/README.DEV	10	share/free-sa/Russian.KOI8-R
11	www/free-sa/d.png	11	share/free-sa/RussianMail.KOI8-R
12	www/free-sa/g.png	12	share/free-sa/German.UTF8
13	www/free-sa/gsa.css	13	share/free-sa/GermanMail.UTF8
14	www/free-sa/lsa.css	14	share/free-sa/Czech.ISO8859-2
15	www/free-sa/rsa.css	15	share/free-sa/CzechMail.ISO8859-2
16	www/free-sa/themes/default	16	share/free-sa/Belarusian.CP1251
17	www/free-sa/themes/rbsec/d.png	17	share/free-sa/BelarusianMail.CP1251
18	www/free-sa/themes/rbsec/g.png	18	share/free-sa/English.ISO8859-1
19	www/free-sa/themes/rbsec/gsa.css	19	share/free-sa/EnglishMail.ISO8859-1
20	www/free-sa/themes/rbsec/lsa.css	20	share/free-sa/Estonian.UTF8
21	www/free-sa/themes/rbsec/rsa.css	21	share/free-sa/EstonianMail.UTF8
22	www/free-sa/themes/sarg/d.png	22	share/free-sa/Italian.ISO8859-1
23	www/free-sa/themes/sarg/g.png	23	share/free-sa/ItalianMail.ISO8859-1
24	www/free-sa/themes/sarg/gsa.css	24	share/free-sa/Slovak.UTF8
25	www/free-sa/themes/sarg/lsa.css	25	share/free-sa/SlovakMail.UTF8
26	www/free-sa/themes/sarg/rsa.css	26	share/doc/free-sa-1.2.0/COPYING
27	www/free-sa/themes/silver/d.png	27	share/doc/free-sa-1.2.0/INSTALL
28	www/free-sa/themes/silver/g.png	28	share/doc/free-sa-1.2.0/README
29	www/free-sa/themes/silver/gsa.css	29	share/doc/free-sa-1.2.0/README.DEV
30	www/free-sa/themes/silver/lsa.css	30	share/doc/free-sa-1.2.0/ChangeLog
31	www/free-sa/themes/silver/rsa.css	31	share/doc/free-sa-1.2.0/FAQ
32	www/free-sa/themes/sa.js	32	share/doc/free-sa-1.2.0/TRANSLATIONS
		33	www/data/free-sa/sa.js
		34	www/data/free-sa/d.png
		35	www/data/free-sa/g.png
		36	www/data/free-sa/gsa.css
		37	www/data/free-sa/lsa.css
		38	www/data/free-sa/rsa.css
		39	www/data/free-sa/themes/default
		40	www/data/free-sa/themes/rbsec/d.png
		41	www/data/free-sa/themes/rbsec/g.png
		42	www/data/free-sa/themes/rbsec/gsa.css
		43	www/data/free-sa/themes/rbsec/lsa.css
		44	www/data/free-sa/themes/rbsec/rsa.css
		45	www/data/free-sa/themes/sarg/d.png
		46	www/data/free-sa/themes/sarg/g.png
		47	www/data/free-sa/themes/sarg/gsa.css
		48	www/data/free-sa/themes/sarg/lsa.css
		49	www/data/free-sa/themes/sarg/rsa.css
		50	www/data/free-sa/themes/silver/d.png
		51	www/data/free-sa/themes/silver/g.png
		52	www/data/free-sa/themes/silver/gsa.css
		53	www/data/free-sa/themes/silver/lsa.css
		54	www/data/free-sa/themes/silver/rsa.css
		55	www/data/free-sa/themes/sa.js
33	@dirrm etc/free-sa	56	@dirrm etc/free-sa
34	@dirrm share/free-sa	57	@dirrm share/free-sa
35	@dirrm share/doc/free-sa-1.0.2	58	@dirrm share/doc/free-sa-1.2.0
36	@dirrm www/free-sa/themes/rbsec	59	@dirrm www/data/free-sa/themes/rbsec
37	@dirrm www/free-sa/themes/sarg	60	@dirrm www/data/free-sa/themes/sarg
38	@dirrm www/free-sa/themes/silver	61	@dirrm www/data/free-sa/themes/silver
39	@dirrm www/free-sa/themes	62	@dirrm www/data/free-sa/themes
40	@dirrm www/free-sa	63	@dirrm www/data/free-sa