diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-03-11 12:51:21 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-03-11 12:51:21 +0000 |
| commit | adf9a35af93a22a96dbb673e45e4415a07f596a4 (patch) | |
| tree | 68c7a668ad676524b0ab4004a4dbcfa19fc23f7f /extra/newt/newt-0.52.7-notcl.patch | |
| parent | 8279802efddeaad8939fce9b0f92296bab912bc4 (diff) | |
| parent | cbea729393aa8736e529eeff8f34fab6a984fe3a (diff) | |
| download | aports-adf9a35af93a22a96dbb673e45e4415a07f596a4.tar.bz2 aports-adf9a35af93a22a96dbb673e45e4415a07f596a4.tar.xz | |
Merge branch 'master' of git://dev.alpinelinux.org/aports
Conflicts:
extra/snort/APKBUILD
testing/hypermail/APKBUILD
Diffstat (limited to 'extra/newt/newt-0.52.7-notcl.patch')
| -rw-r--r-- | extra/newt/newt-0.52.7-notcl.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/extra/newt/newt-0.52.7-notcl.patch b/extra/newt/newt-0.52.7-notcl.patch new file mode 100644 index 000000000..b9f86e6b6 --- /dev/null +++ b/extra/newt/newt-0.52.7-notcl.patch @@ -0,0 +1,35 @@ +--- newt-0.52.7/Makefile.in.orig 2008-01-15 16:57:12.000000000 +0100 ++++ newt-0.52.7/Makefile.in 2008-01-15 16:58:38.000000000 +0100 +@@ -15,7 +15,7 @@ + PYTHONVERS = @PYTHONVERS@ + WHIPTCLSO = @WHIPTCLSO@ + +-PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey ++PROGS = test whiptail testgrid testtree showchars showkey + TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o + NDIALOGOBJS = whiptail.o dialogboxes.o + WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o +@@ -78,9 +78,6 @@ + whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) + $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt + +-whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH) +- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lslang -lpopt -lm +- + $(LIBNEWT): $(LIBOBJS) + ar rv $@ $^ + +@@ -120,12 +117,11 @@ + install -m 644 whiptail.1 $(instroot)/$(man1dir) + make -C po datadir=$(instroot)/$(datadir) install + +-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so ++install-sh: sharedlib _snackmodule.so + [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir) + install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir) + ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so + ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) +- [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : + for ver in $(PYTHONVERS) ; do \ + [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ + install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ |