Fix build with -fno-common

18 files changed, 235 insertions, 1 deletions

diff --git a/astro/sextractor/Makefile b/astro/sextractor/Makefile
index eaa417d709c3..451c33d5a2ba 100644
--- a/astro/sextractor/Makefile
+++ b/astro/sextractor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sextractor
 PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/ \
 		http://download.gna.org/kanicule/freebsd/distfiles/
@@ -11,6 +11,9 @@ MASTER_SITES=	ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/ \
 MAINTAINER=	mathias@monnerville.com
 COMMENT=	Catalogue of objects builder from astronomical images
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 USES=		gmake
 
diff --git a/astro/sextractor/files/patch-src_analyse.c b/astro/sextractor/files/patch-src_analyse.c
new file mode 100644
index 000000000000..61e69ae373af
--- /dev/null
+++ b/astro/sextractor/files/patch-src_analyse.c
@@ -0,0 +1,20 @@
+--- src/analyse.c.orig	2006-06-29 17:58:03 UTC
++++ src/analyse.c
+@@ -23,6 +23,8 @@
+ #include	<stdlib.h>
+ #include	<string.h>
+ 
++#define		IN_MAIN
++
+ #include	"define.h"
+ #include	"globals.h"
+ #include	"prefs.h"
+@@ -41,7 +43,7 @@
+ #include	"som.h"
+ #include	"winpos.h"
+ 
+-static obj2struct	*obj2 = &outobj2;
++static obj2struct *obj2 = &outobj2;
+ 
+ /********************************* analyse ***********************************/
+ void  analyse(picstruct *field, picstruct *dfield, int objnb,
diff --git a/astro/sextractor/files/patch-src_catout.c b/astro/sextractor/files/patch-src_catout.c
new file mode 100644
index 000000000000..13bdc1ea0144
--- /dev/null
+++ b/astro/sextractor/files/patch-src_catout.c
@@ -0,0 +1,10 @@
+--- src/catout.c.orig	2006-07-14 17:13:55 UTC
++++ src/catout.c
+@@ -32,6 +32,7 @@
+ #include	"sexheadsc.h"
+ #include	"xml.h"
+ 
++double		ddummy;
+ catstruct	*fitscat;
+ tabstruct	*objtab = NULL;
+ FILE		*ascfile;
diff --git a/astro/sextractor/files/patch-src_clean.c b/astro/sextractor/files/patch-src_clean.c
new file mode 100644
index 000000000000..d7ecba0af718
--- /dev/null
+++ b/astro/sextractor/files/patch-src_clean.c
@@ -0,0 +1,11 @@
+--- src/clean.c.orig	2005-10-24 11:48:52 UTC
++++ src/clean.c
+@@ -34,7 +34,7 @@
+ /*------------------------------- variables ---------------------------------*/
+ 
+ static LONG		*cleanvictim;
+-
++objliststruct		*cleanobjlist;
+ 
+ /******************************* initclean **********************************
+ PROTO   void initclean(void)
diff --git a/astro/sextractor/files/patch-src_clean.h b/astro/sextractor/files/patch-src_clean.h
new file mode 100644
index 000000000000..0d43cb815816
--- /dev/null
+++ b/astro/sextractor/files/patch-src_clean.h
@@ -0,0 +1,11 @@
+--- src/clean.h.orig	2005-10-24 11:48:52 UTC
++++ src/clean.h
+@@ -22,7 +22,7 @@
+ 
+ /*------------------------------- variables ---------------------------------*/
+ 
+-objliststruct	*cleanobjlist;		/* laconic, isn't it? */
++EXTERN objliststruct	*cleanobjlist;		/* laconic, isn't it? */
+ 
+ /*------------------------------- functions ---------------------------------*/
+ 
diff --git a/astro/sextractor/files/patch-src_define.h b/astro/sextractor/files/patch-src_define.h
new file mode 100644
index 000000000000..aa21e423abae
--- /dev/null
+++ b/astro/sextractor/files/patch-src_define.h
@@ -0,0 +1,14 @@
+--- src/define.h.orig	2006-07-12 17:20:12 UTC
++++ src/define.h
+@@ -194,3 +194,11 @@
+ #define FLAG(x)		(*((char *)&flag##x))
+ 
+ #define VECFLAG(x)	(*((char *)flag##x))
++
++#ifdef IN_MAIN
++#define EXTERN
++#warning IN_MAIN
++#else
++#define EXTERN extern
++#warning NOT_IN_MAIN
++#endif
diff --git a/astro/sextractor/files/patch-src_extract.h b/astro/sextractor/files/patch-src_extract.h
new file mode 100644
index 000000000000..b24a22008262
--- /dev/null
+++ b/astro/sextractor/files/patch-src_extract.h
@@ -0,0 +1,11 @@
+--- src/extract.h.orig	2005-11-30 06:10:08 UTC
++++ src/extract.h
+@@ -26,7 +26,7 @@ typedef	enum		{COMPLETE, INCOMPLETE, NONOBJECT, OBJECT
+ 				status;	/* Extraction status */
+ 
+ /*--------------------------------- variables -------------------------------*/
+-PIXTYPE		*dumscan;
++EXTERN PIXTYPE		*dumscan;
+ 
+ /*------------------------------- structures --------------------------------*/
+ /* Temporary object parameters during extraction */
diff --git a/astro/sextractor/files/patch-src_filter.c b/astro/sextractor/files/patch-src_filter.c
new file mode 100644
index 000000000000..29994925cbc8
--- /dev/null
+++ b/astro/sextractor/files/patch-src_filter.c
@@ -0,0 +1,11 @@
+--- src/filter.c.orig	2005-12-21 19:26:40 UTC
++++ src/filter.c
+@@ -32,6 +32,8 @@
+ #include	"filter.h"
+ #include	"image.h"
+ 
++filterstruct	*thefilter;
++
+ /******************************** convolve ***********************************/
+ /*
+ Convolve a scan line with an array.
diff --git a/astro/sextractor/files/patch-src_filter.h b/astro/sextractor/files/patch-src_filter.h
new file mode 100644
index 000000000000..b89fb6075afb
--- /dev/null
+++ b/astro/sextractor/files/patch-src_filter.h
@@ -0,0 +1,11 @@
+--- src/filter.h.orig	2005-10-24 11:48:52 UTC
++++ src/filter.h
+@@ -32,7 +32,7 @@ typedef struct structfilter
+   struct structbpann	*bpann;
+   }	filterstruct;
+ 
+-filterstruct	*thefilter;
++EXTERN filterstruct	*thefilter;
+ 
+ /*------------------------------- functions ---------------------------------*/
+ void		convolve(picstruct *, PIXTYPE *),
diff --git a/astro/sextractor/files/patch-src_fits_fitscat.h b/astro/sextractor/files/patch-src_fits_fitscat.h
new file mode 100644
index 000000000000..92ddbeccd44b
--- /dev/null
+++ b/astro/sextractor/files/patch-src_fits_fitscat.h
@@ -0,0 +1,18 @@
+--- src/fits/fitscat.h.orig	2006-07-10 13:17:06 UTC
++++ src/fits/fitscat.h
+@@ -306,7 +306,14 @@ extern  void	error(int, char *, char *),
+ 		swapbytes(void *ptr, int nb, int n),
+ 		warning(char *msg1, char *msg2);
+ 
++#ifdef IN_MAIN
++#define EXTERN
++#warning IN_MAIN
++#else
++#define EXTERN extern
++#warning NOT_IN_MAIN
++#endif
+ 
+-int		bswapflag;
++EXTERN int	bswapflag;
+ 
+ #endif
diff --git a/astro/sextractor/files/patch-src_globals.h b/astro/sextractor/files/patch-src_globals.h
new file mode 100644
index 000000000000..90deffcaae14
--- /dev/null
+++ b/astro/sextractor/files/patch-src_globals.h
@@ -0,0 +1,30 @@
+--- src/globals.h.orig	2006-07-14 14:28:10 UTC
++++ src/globals.h
+@@ -18,13 +18,13 @@
+ 
+ /*----------------------- miscellaneous variables ---------------------------*/
+ 
+-sexcatstruct		thecat;
+-picstruct		thefield1,thefield2, thewfield1,thewfield2;
+-objstruct		flagobj;
+-obj2struct		flagobj2;
++EXTERN sexcatstruct	thecat;
++EXTERN picstruct	thefield1,thefield2, thewfield1,thewfield2;
++EXTERN objstruct	flagobj;
++EXTERN obj2struct	flagobj2;
+ extern obj2struct	outobj2;
+-float			ctg[37], stg[37];
+-char			gstr[MAXCHAR];
++EXTERN float		ctg[37], stg[37];
++EXTERN char		gstr[MAXCHAR];
+ 
+ /*------------------------------- functions ---------------------------------*/
+ extern void	allocparcelout(void),
+@@ -81,6 +81,6 @@ extern void	*loadstrip(picstruct *, picstruct *);
+ 
+ extern char	*readfitshead(FILE *, char *, int *);
+ 
+-extern picstruct	*inheritfield(picstruct *infield, int flags),
++extern picstruct *inheritfield(picstruct *infield, int flags),
+ 			*newfield(char *, int , int);
+ 
diff --git a/astro/sextractor/files/patch-src_plist.h b/astro/sextractor/files/patch-src_plist.h
new file mode 100644
index 000000000000..5910172b2b81
--- /dev/null
+++ b/astro/sextractor/files/patch-src_plist.h
@@ -0,0 +1,11 @@
+--- src/plist.h.orig	2005-11-30 05:52:39 UTC
++++ src/plist.h
+@@ -35,7 +35,7 @@ typedef struct
+ 
+ /*-------------------------------- globals ----------------------------------*/
+ 
+-int	plistexist_value, plistexist_dvalue, plistexist_cdvalue,
++EXTERN int	plistexist_value, plistexist_dvalue, plistexist_cdvalue,
+ 	plistexist_flag, plistexist_wflag, plistexist_dthresh, plistexist_var,
+ 	plistoff_value, plistoff_dvalue, plistoff_cdvalue,
+ 	plistoff_flag[MAXFLAG], plistoff_wflag, plistoff_dthresh, plistoff_var,
diff --git a/astro/sextractor/files/patch-src_prefs.h b/astro/sextractor/files/patch-src_prefs.h
new file mode 100644
index 000000000000..e6c29c503414
--- /dev/null
+++ b/astro/sextractor/files/patch-src_prefs.h
@@ -0,0 +1,11 @@
+--- src/prefs.h.orig	2006-07-13 17:11:09 UTC
++++ src/prefs.h
+@@ -206,7 +206,7 @@ typedef struct
+   int		nthreads;			/* Number of active threads */
+   }	prefstruct;
+ 
+-  prefstruct		prefs;
++EXTERN prefstruct	prefs;
+ 
+ /*-------------------------------- protos -----------------------------------*/
+ extern int	cistrcmp(char *cs, char *ct, int mode);
diff --git a/astro/sextractor/files/patch-src_psf.h b/astro/sextractor/files/patch-src_psf.h
new file mode 100644
index 000000000000..348f4e73e9c8
--- /dev/null
+++ b/astro/sextractor/files/patch-src_psf.h
@@ -0,0 +1,15 @@
+--- src/psf.h.orig	2006-01-12 18:30:35 UTC
++++ src/psf.h
+@@ -89,9 +89,9 @@ typedef struct
+   }	psfitstruct;
+ 
+ /*----------------------------- Global variables ----------------------------*/
+-psfstruct	*psf,*ppsf,*thepsf;
+-psfitstruct	*thepsfit,*ppsfit,*psfit;
+-PIXTYPE		*checkmask;
++EXTERN psfstruct	*psf,*ppsf,*thepsf;
++EXTERN psfitstruct	*thepsfit,*ppsfit,*psfit;
++EXTERN PIXTYPE		*checkmask;
+ 
+ /*-------------------------------- functions --------------------------------*/
+ extern void	compute_pos(int *pnpsf,int *pconvflag,int *pnpsfflag,
diff --git a/astro/sextractor/files/patch-src_retina.h b/astro/sextractor/files/patch-src_retina.h
new file mode 100644
index 000000000000..20cbc09ca0a4
--- /dev/null
+++ b/astro/sextractor/files/patch-src_retina.h
@@ -0,0 +1,11 @@
+--- src/retina.h.orig	2005-10-24 11:48:52 UTC
++++ src/retina.h
+@@ -25,7 +25,7 @@ typedef struct structreti
+   struct structbpann	*bpann;	/* The neural network */
+   }     retistruct;
+ 
+-retistruct	*theretina;
++EXTERN retistruct	*theretina;
+ 
+ /*------------------------------- functions ---------------------------------*/
+ 
diff --git a/astro/sextractor/files/patch-src_scan.c b/astro/sextractor/files/patch-src_scan.c
new file mode 100644
index 000000000000..2295cbccf3f0
--- /dev/null
+++ b/astro/sextractor/files/patch-src_scan.c
@@ -0,0 +1,12 @@
+--- src/scan.c.orig	2006-06-29 20:03:13 UTC
++++ src/scan.c
+@@ -49,6 +49,9 @@ NOTES   -.
+ AUTHOR  E. Bertin (IAP)
+ VERSION 29/11/2005
+  ***/
++
++PIXTYPE		*dumscan;
++
+ void	scanimage(picstruct *field, picstruct *dfield, picstruct **pffield,
+ 		int nffield, picstruct *wfield, picstruct *dwfield)
+ 
diff --git a/astro/sextractor/files/patch-src_sexhead1.h b/astro/sextractor/files/patch-src_sexhead1.h
new file mode 100644
index 000000000000..d83f6137a8c2
--- /dev/null
+++ b/astro/sextractor/files/patch-src_sexhead1.h
@@ -0,0 +1,13 @@
+--- src/sexhead1.h.orig	2005-10-24 11:48:52 UTC
++++ src/sexhead1.h
+@@ -15,8 +15,8 @@
+ */
+ 
+ 
+-int	idummy;
+-double	ddummy;
++EXTERN int	idummy;
++EXTERN double	ddummy;
+ 
+ keystruct	headkey1[] = {
+   {"EPOCH   ", "",
diff --git a/astro/sextractor/files/patch-src_som.h b/astro/sextractor/files/patch-src_som.h
new file mode 100644
index 000000000000..d13edbf834c1
--- /dev/null
+++ b/astro/sextractor/files/patch-src_som.h
@@ -0,0 +1,11 @@
+--- src/som.h.orig	2005-10-24 11:48:52 UTC
++++ src/som.h
+@@ -58,7 +58,7 @@ typedef struct
+   float		stderror;		/* Global reduced error */
+   }	somstruct;
+ 
+-somstruct	*thesom;
++EXTERN somstruct	*thesom;
+ 
+ /*---------------------------------- protos --------------------------------*/
+