cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use a V version variable

Browse Source 
- tweak WRKDIST and WRKSRC and regen patches accordingly
- simplify substitution in pre-configure
no package change
This commit is contained in:
ajacoutot 2007-12-18 09:08:24 +00:00
parent 1d866f4f78
commit f95a4dc560
6 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
astro/sattrack/Makefile
View File

@ -1,27 +1,30 @@
# $OpenBSD: Makefile,v 1.23 2007/09/20 15:22:30 steven Exp $
# $OpenBSD: Makefile,v 1.24 2007/12/18 09:08:24 ajacoutot Exp $
V= 3.1.6
COMMENT= real-time satellite tracking and orbit propagation program
DISTNAME= sattrack-3.1.6
DISTNAME= sattrack-${V}
PKGNAME= ${DISTNAME}p1
CATEGORIES= astro
# Commercial License
PERMIT_PACKAGE_CDROM= May not be bundled, according to copyright
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= May not be bundled, according to copyright
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xt c m
WANTLIB= ICE SM X11 Xt c m
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
USE_X11= Yes
WRKDIST= ${WRKDIR}/SatTrack-3.1.6/src
WRKDIST= ${WRKDIR}/SatTrack-${V}
WRKSRC= ${WRKDIST}/src
pre-configure:
@sed -e s,__PREFIX__,$(PREFIX), $(WRKSRC)/../run/getsts > $(WRKSRC)/../run/getsts.new
@sed -e s,__PREFIX__,$(PREFIX), $(WRKSRC)/../run/gettle > $(WRKSRC)/../run/gettle.new
@mv $(WRKSRC)/../run/getsts.new $(WRKSRC)/../run/getsts
@mv $(WRKSRC)/../run/gettle.new $(WRKSRC)/../run/gettle
@perl -pi -e 's,__PREFIX__,${PREFIX},g' \
${WRKDIST}/run/getsts \
${WRKDIST}/run/gettle
post-install:
chown -R ${SHAREOWN}:${SHAREGRP} \

5
astro/sattrack/patches/patch-run_getsts
View File

@ -1,5 +1,6 @@
--- ../run/getsts.orig Tue Jan 14 14:21:06 1997
+++ ../run/getsts Sat Jan 22 23:50:19 2000
$OpenBSD: patch-run_getsts,v 1.2 2007/12/18 09:08:24 ajacoutot Exp $
--- run/getsts.orig Tue Jan 14 20:21:06 1997
+++ run/getsts Tue Dec 18 09:53:05 2007
@@ -24,19 +24,22 @@
#
set stsnum=81

5
astro/sattrack/patches/patch-run_gettle
View File

@ -1,5 +1,6 @@
--- ../run/gettle.orig Tue Mar 14 23:26:06 1995
+++ ../run/gettle Sat Jan 22 23:51:30 2000
$OpenBSD: patch-run_gettle,v 1.2 2007/12/18 09:08:24 ajacoutot Exp $
--- run/gettle.orig Wed Mar 15 05:26:06 1995
+++ run/gettle Tue Dec 18 09:53:05 2007
@@ -24,18 +24,21 @@
#
#

15
astro/sattrack/patches/patch-Makefile → astro/sattrack/patches/patch-src_Makefile
View File

@ -1,5 +1,6 @@
--- ../src/Makefile.orig Mon Jan 13 18:51:01 1997
+++ ../src/Makefile Sat Jan 22 23:37:21 2000
$OpenBSD: patch-src_Makefile,v 1.1 2007/12/18 09:08:24 ajacoutot Exp $
--- src/Makefile.orig Tue Jan 14 00:51:01 1997
+++ src/Makefile Tue Dec 18 09:53:05 2007
@@ -113,10 +113,10 @@
# Sun-4 (SPARCstation 5 or 10 with Solaris 2.x, using 'gcc' only)
@ -15,7 +16,7 @@
# Apollo 700 (HP Apollo 9000 Series 700 with HPUX)
#
@@ -228,7 +228,7 @@
@@ -228,7 +228,7 @@ CC = gcc
#CC_CUSR = -DREVERSEVIDEO -DXWINDOW
#CC_CUSR = -DHOMEDIR -DREVERSEVIDEO -DXWINDOW
@ -24,7 +25,7 @@
#
#-------------------------------------------------------------------------------
@@ -245,7 +245,8 @@
@@ -245,7 +245,8 @@ CC_CUSR = -DHOMEDIR -DREVERSEVIDEO -DSUNTRANSITS -DXW
# but should be accessible by other users as well.
#
@ -34,7 +35,7 @@
#
#-------------------------------------------------------------------------------
@@ -253,9 +254,13 @@
@@ -253,9 +254,13 @@ CC_CUSR = -DHOMEDIR -DREVERSEVIDEO -DSUNTRANSITS -DXW
# SATTRACK SUB-DIRECTORIES
#
@ -51,7 +52,7 @@
INC = $(SRC)/include
@@ -318,13 +323,15 @@
@@ -318,13 +323,15 @@ CC_CISI =
#X11 = /usr/include
#X11 = /usr/local/include
#X11 = /usr/include/X11
@ -69,7 +70,7 @@
#LX11 = -L/usr/openwin/lib -lX11 -lXt -lICE -lSM
#CC_CXINC =
@@ -355,6 +362,30 @@
@@ -355,6 +362,30 @@ clean:
cd $(RUN) ; \
/bin/rm -f fixchecksum makeamsat makepassesx maketles maketlex \
satfilter sattrack xdemo

5
astro/sattrack/patches/patch-src_include_sattrack_h
View File

@ -1,5 +1,6 @@
--- ../src/include/sattrack.h.orig Tue Jan 14 10:38:38 1997
+++ ../src/include/sattrack.h Sat Jan 22 23:37:21 2000
$OpenBSD: patch-src_include_sattrack_h,v 1.2 2007/12/18 09:08:24 ajacoutot Exp $
--- src/include/sattrack.h.orig Tue Jan 14 16:38:38 1997
+++ src/include/sattrack.h Tue Dec 18 09:53:05 2007
@@ -74,13 +74,15 @@
/* */
/******************************************************************************/

11
astro/sattrack/patches/patch-sattrack_c → astro/sattrack/patches/patch-src_sattrack_sattrack_c
View File

@ -1,6 +1,7 @@
--- sattrack/sattrack.c.orig Tue Jan 14 00:06:10 1997
+++ sattrack/sattrack.c Sat Jan 22 23:37:22 2000
@@ -2081,12 +2081,12 @@
$OpenBSD: patch-src_sattrack_sattrack_c,v 1.1 2007/12/18 09:08:24 ajacoutot Exp $
--- src/sattrack/sattrack.c.orig Tue Jan 14 06:06:10 1997
+++ src/sattrack/sattrack.c Tue Dec 18 09:53:05 2007
@@ -2081,12 +2081,12 @@ int entryFlag;
memcpy((char *)&modified,(char *)&original,sizeof(struct termios));
#endif
@ -15,7 +16,7 @@
ioctl(STDIN_FILENO,TCGETS,&original);
memcpy((char *)&modified,(char *)&original,sizeof(struct termios));
#endif
@@ -2114,11 +2114,11 @@
@@ -2114,11 +2114,11 @@ int entryFlag;
ioctl(STDIN_FILENO,XCSETA,&modified);
#endif
@ -29,7 +30,7 @@
ioctl(STDIN_FILENO,TCSETS,&modified);
#endif
@@ -2138,11 +2138,11 @@
@@ -2138,11 +2138,11 @@ int entryFlag;
ioctl(STDIN_FILENO,XCSETA,&original);
#endif